mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
3001 commits 10 branches 31 tags 48 MiB
Commit graph

1613 commits

Author SHA1 Message Date
Amar Takhar
5eaa033697 Remove some EOF whitespace. 
Originally committed to SVN as r2867.
 2009-04-28 05:21:23 +00:00
Amar Takhar
d226cdf33c Add some error-checking and exit 1's. 
Originally committed to SVN as r2866.
 2009-04-28 05:17:33 +00:00
Amar Takhar
5de0558228 Add exit codes to various commands to ensure the script fails and doesn't proceed to the next step(s). 
Originally committed to SVN as r2865.
 2009-04-28 05:11:32 +00:00
Amar Takhar
c12d2d7636 Testing the tinderbox (a stub commit but still useful.) 
Originally committed to SVN as r2864.
 2009-04-28 05:08:18 +00:00
Amar Takhar
3648f61083 Testing the tinderbox. 
Originally committed to SVN as r2863.
 2009-04-27 20:58:42 +00:00
Karl Blomster
51df55edd7 Fix some more minor editbox regressions introduced in r2859. Patch by Harukalover, updates #794 
Originally committed to SVN as r2861.
 2009-04-26 04:31:19 +00:00
Karl Blomster
eed65e8945 Fix a minor graphical glitch in the time edit boxes introduced in r2859. Patch by Harukalover. updates #794 
Originally committed to SVN as r2860.
 2009-04-26 01:23:01 +00:00
Karl Blomster
31aed4c1a7 Fix a number of odd quirks regarding how grid selection is moved after committing multiple lines, and how audio selection moves after committing. See #794 for full details. Patch by Harukalover. 
closes #64, #420, #794

Originally committed to SVN as r2859.
 2009-04-26 01:02:23 +00:00
Karl Blomster
76cec3ec29 Fix a bug that would cause a crash under certain conditions when trying to change the properties of a recently deleted line. Patch by Plorkyeran, closes #815 
Originally committed to SVN as r2858.
 2009-04-26 00:25:33 +00:00
Karl Blomster
32eb3a8a62 Fix a bug that would cause the program to crash if CSRI was selected as subtitle renderer but no CSRI renderer was actually installed. Patch by Plorkyeran, closes: 462 
Originally committed to SVN as r2857.
 2009-04-26 00:11:29 +00:00
Karl Blomster
4dafa0ff10 Use less magic numbers 
Originally committed to SVN as r2856.
 2009-04-25 23:08:45 +00:00
Karl Blomster
4efd1b5567 Update ffms2.lib 
Originally committed to SVN as r2855.
 2009-04-25 23:04:06 +00:00
Amar Takhar
72c5828bc0 Sigh, add @set before the recently added environment variables (r2847) 
Originally committed to SVN as r2854.
 2009-04-25 23:00:29 +00:00
Fredrik Mellbin
140dc44882 FFMS2: Another much needed set of fixes to the Haali part 
Originally committed to SVN as r2853.
 2009-04-25 22:09:49 +00:00
Fredrik Mellbin
a41e48a159 Fix the video provider after the FFMS2 changes part2 
Originally committed to SVN as r2852.
 2009-04-25 10:31:39 +00:00
Fredrik Mellbin
f64b10978b Fix the video provider after the FFMS2 changes 
Originally committed to SVN as r2851.
 2009-04-25 09:26:03 +00:00
Fredrik Mellbin
8f7930e876 FFMS2: Even less enum forward declarations 
Originally committed to SVN as r2850.
 2009-04-25 09:09:14 +00:00
Fredrik Mellbin
6f6d1bdf3a FFMS2: Less enum forward declaration? 
Originally committed to SVN as r2849.
 2009-04-25 08:55:14 +00:00
Amar Takhar
f8652576c8 Add CommonProgramFiles CommonProgramFiles(x86) ProgramFiles ProgramFiles(x86) to the build environment. 
Originally committed to SVN as r2847.
 2009-04-25 02:04:33 +00:00
Amar Takhar
57024a2e7c vc++ needs TMP/TEMP to be set in the env in order to work correctly. 
Originally committed to SVN as r2846.
 2009-04-24 23:23:48 +00:00
Fredrik Mellbin
6fae2955fd FFMS2: 
Remove the dependency of pixfmt.h in ffms.h
Added the alternative FFMS_GetPixFmt() for getting the different pixel format values

Originally committed to SVN as r2845.
 2009-04-24 19:56:19 +00:00
Karl Blomster
aaad6b4ad6 Update ffms2.lib again 
Originally committed to SVN as r2844.
 2009-04-24 18:41:34 +00:00
Fredrik Mellbin
83586d2b18 FFMS2: 
Several bugfixes which should fix crashes in recent versions
Added a simple regression test application
Removed a few useless functions from the API
Add TheFluff's FFmpegSource 1.21 syntax compatibility script

Originally committed to SVN as r2843.
 2009-04-24 17:42:21 +00:00
Amar Takhar
45d6e37ee8 Whoops, remove trunk\ from the solution path. 
Originally committed to SVN as r2842.
 2009-04-24 04:16:01 +00:00
Amar Takhar
c2e02322cf Add a bath file to compile aegisub, these will exist _per_ buildslave. It's probably better to keep it here anyway as build environments will not be changable without a historical record being kept. (it's also easier!) 
Originally committed to SVN as r2841.
 2009-04-24 04:00:04 +00:00
Amar Takhar
fb36f6d4af Add a solution and windows config for Windows tinderbox building. Submitted by jfs, thanks! 
Originally committed to SVN as r2840.
 2009-04-23 20:26:07 +00:00
Karl Blomster
4c68bb5412 Updated German translation (by Sebastian Billau). 
Originally committed to SVN as r2839.
 2009-04-23 10:32:00 +00:00
Karl Blomster
53bc5a034d Avisynth video provider will now use ffmpegsource2 instead of ffmpegsource when so required. 
Originally committed to SVN as r2838.
 2009-04-23 02:09:05 +00:00
Fredrik Mellbin
e42ae2d19d FFMS2: Various fixes to haali stuff 
Originally committed to SVN as r2837.
 2009-04-22 18:38:28 +00:00
Amar Takhar
ff7ee2e776 Add a cross-compile condition to AC_RUN_IFELSE in AC_AGI_COMPILE to make cross-compiling work. 
Originally committed to SVN as r2836.
 2009-04-21 22:32:07 +00:00
Amar Takhar
e2d0317df3 Bunk commit to trigger the build cluster. 
Originally committed to SVN as r2835.
 2009-04-21 18:48:59 +00:00
Amar Takhar
af68c58f56 Add a command to autogen --skip-configure to allow the autogen/configure steps 
to be split for the build tinderbox.

Originally committed to SVN as r2834.
 2009-04-20 02:45:35 +00:00
Amar Takhar
544c325dde Fix typo. 
Originally committed to SVN as r2833.
 2009-04-20 02:43:32 +00:00
Niels Martin Hansen
2ba96af5b2 Remove outdated and unused Windows installer scripts. 
Originally committed to SVN as r2832.
 2009-04-19 20:48:08 +00:00
Niels Martin Hansen
e2a75490c9 Remove the annoyance known as Tip of the Day. Right now it's completely inaccessible, but might return in a different incarnation when we get out of strings freeze. 
Originally committed to SVN as r2831.
 2009-04-18 15:29:13 +00:00
Niels Martin Hansen
6ec31a3a08 Simplify code to pick mapping size in PCMWAV provider, just use sizeof(void*) to determine address space size. 
Originally committed to SVN as r2830.
 2009-04-18 15:16:15 +00:00
Niels Martin Hansen
f5bc001e90 Move more project settings into property sheet files. 
Originally committed to SVN as r2829.
 2009-04-18 13:40:52 +00:00
Niels Martin Hansen
a749c23e8b Rename auto3 DLL to something less ugly. 
Originally committed to SVN as r2828.
 2009-04-18 13:31:08 +00:00
Karl Blomster
f6016573c8 revert revision 2825 since apparently it broke all of jfs' changes 
Originally committed to SVN as r2827.
 2009-04-18 13:02:13 +00:00
Karl Blomster
65e69a51cf "Fix" an issue that would cause the FFMS2 audio provider to crash when fed with a unicode filename/path. The solution involves getting the "short path", no idea if it works on Unix. Fixes bugtracker issues #810 and #808. 
Originally committed to SVN as r2826.
 2009-04-18 10:54:20 +00:00
Karl Blomster
caa26103f5 add portaudio_x86.dll to the list of delay-loaded dll's in the vs2008 project file 
Originally committed to SVN as r2825.
 2009-04-18 09:37:54 +00:00
Karl Blomster
f20737b8b2 Fix an issue where the grid font face option's font browser button wouldn't actually update the setting. Patch by Harukalover, resolves bugtracker issues #706 and (partially) #821. 
Originally committed to SVN as r2824.
 2009-04-18 09:12:26 +00:00
Niels Martin Hansen
fe393f82af No longer support anything for Windows-builds but Visual Studio 2008/VC9. 
Remove all outdated, unmaintained project files and some unused dirs, and other stuff related to outdated build methods.

Originally committed to SVN as r2821.
 2009-04-17 22:08:37 +00:00
Niels Martin Hansen
30057004f1 Some changes to property sheets went unsaved before previous commit, oops. 
(This made linking in various things impossible.)

Originally committed to SVN as r2820.
 2009-04-17 21:58:17 +00:00
Niels Martin Hansen
77791217a0 Refactor Visual Studio 2008 build and make libauto3 and Lua 5.0 build on VC9. 
* The most important project properties (especially paths) are now stored in VSProps files in generalised ways.
* Projects share VSProps files so they place output files in same locations and thus agree on where to find them.
* Avoid inconsistencies between build configurations/platforms as has happened often before.
* Now distributable binaries (aegisub.exe and aegisub-auto3.dll) will be placed in $(SolutionDir)/bin/, static libraries under $(SolutionDir)/lib/ and object files etc. under $(SolutionDir)/build/. Note that those locations are controlled by where the solution file is placed in the file system.
* libauto3 is no longer pulled in by a #pragma in auto4_auto3.c, but must instead be pulled in by making the aegisub project depend on the auto3 project, which must in turn depend on the lua50 project.
* Final binary filenames are now somewhat different. You get aegisub32.exe, aegisub64d.exe, aegisub-auto3lib32d.dll and more.
* There's still more that can be factored out, things like optimisation flags and defines.

Originally committed to SVN as r2819.
 2009-04-17 21:53:48 +00:00
Niels Martin Hansen
c55df071cf The lines.n value produced by Auto3 implementation was 1 too small causing the last line in a file to be eaten by karaskel. 
Originally committed to SVN as r2818.
 2009-04-17 21:34:43 +00:00
Niels Martin Hansen
5a76711a19 Make callables.c error properly if it's attempted compiled separately. 
Originally committed to SVN as r2817.
 2009-04-17 20:55:48 +00:00
Niels Martin Hansen
8a5933385d Make libauto3 better liked by MSVC 2008. 
Originally committed to SVN as r2816.
 2009-04-17 20:51:58 +00:00
Karl Blomster
cc26be476e add portaudio2 player to the vs2005 project as well while I'm at it 
Originally committed to SVN as r2814.
 2009-04-17 19:45:33 +00:00
Karl Blomster
8a6206e5d0 add portaudio2 audio player to config/config_windows0.h and the vs2008 project file 
Originally committed to SVN as r2813.
 2009-04-17 19:44:07 +00:00
Karl Blomster
c3afb85af4 change buffer length/wanted latency in the dsound2 audio player to 80/4 (down from 100/5); should make it a bit more responsive 
Originally committed to SVN as r2812.
 2009-04-17 19:40:29 +00:00
Karl Blomster
0d6454087e update ffms2.lib 
Originally committed to SVN as r2811.
 2009-04-17 19:38:12 +00:00
Niels Martin Hansen
7a19b273b1 Fix crash in PCM audio provider when using files larger than the mapping size (256 MB on 32 bit). The length of mappings closer than mapping-size to the end of the file, when the file was larger, would not be adjusted to not cross the end of file. 
Originally committed to SVN as r2810.
 2009-04-17 16:34:06 +00:00
Amar Takhar
49e3895180 Re-order the functions so they're in line with every other player: Constructor, 
Destructor, Open, Close, Play, Stop..  I rue the fact that I didn't do this at
the start.

Originally committed to SVN as r2809.
 2009-04-17 13:58:44 +00:00
Karl Blomster
d77c119d63 Fix a bug in FFMS2 that caused it to write timecodes with scientific notation. 
Originally committed to SVN as r2808.
 2009-04-17 03:25:10 +00:00
Amar Takhar
6c256fd181 * Remove a short-lived hack (hours?) and replace it with a 
PaStreamFinishedCallback which is called anytime a PaCallback is exited with
  anything other than 0. (normal operation)  paStreamFinishedCallback handles
  stopping the audio stream when we've run to the end of the current selection
  or the stream is stopped.
* Add framesPerBuffer to paCallback debug output in preperation for dynamic
  buffers.
* Set paPrimeOutputBuffersUsingStreamCallback in Pa_OpenStream to prime the
  output buffer using the callback rather than initing with empty space which
  is the default.
* Indent paCallback decleration another level.

Originally committed to SVN as r2807.
 2009-04-17 02:14:42 +00:00
Amar Takhar
50ce42d2e9 * Fold entire callback into a single if-else block. 
* Remove 'end' variable and just return 0 if we have more to play.

Originally committed to SVN as r2806.
 2009-04-16 20:55:14 +00:00
Amar Takhar
eb65009f66 * Remove variable 'avail'. 
* Fold lenAvailable logic into a ternary operator.
* Use GetAduioWithVolume instead of applying volume ourselves.
* Remove code used to zero rest of the buffer. (not required)

Originally committed to SVN as r2805.
 2009-04-16 20:49:37 +00:00
Amar Takhar
c6364bf43d * Set Pa_OpenStream to use paClipOff as we don't need any clipping 
* Update comment (realPlayPos has been removed).
* Return from paCallback with paAbort if there is no more audio to play.
  Also set endPos to be less than the current playPos to stop the audio
  event timer.
* Add CPU usage statistics to debug printf in paCallback.

Originally committed to SVN as r2804.
 2009-04-16 19:55:52 +00:00
Amar Takhar
3e864d10c9 Make debug printf's a perm fixture wrapped with PORTAUDIO2_DEBUG. 
Originally committed to SVN as r2803.
 2009-04-16 14:22:46 +00:00
Niels Martin Hansen
7271a74b54 Forgot to put license on VideoSink.h as well. 
Originally committed to SVN as r2802.
 2009-04-16 13:01:05 +00:00
Niels Martin Hansen
4da7a70608 Clarify license for VideoSink.cpp. 
<jfs> hmm Haali, the VideoSink.cpp you have contributed to aegisub doesn't have a license attached... I see you put MatroskaParser.c into 3-clause BSD like the rest of aegisub though, what about VideoSink ?
<Haali> jfs: BSD license is ok for that file

Originally committed to SVN as r2801.
 2009-04-16 12:15:57 +00:00
Amar Takhar
50214a2a6a Move the comment for the PortAudio library to setup.cpp. 
Requested by: TheFluff

Originally committed to SVN as r2800.
 2009-04-15 20:16:54 +00:00
Amar Takhar
50b7f33117 Don't initalise favorite to 0 (it's a a wxString). 
Originally committed to SVN as r2799.
 2009-04-15 20:11:53 +00:00
Amar Takhar
918945e03b Don't set the current position via the PortAudio callback, instead set 
GetCurrentPosition() to return the correct value using Pa_GetStreamTime().  Not
only does it not work on every platform, there is no point in setting it during
the callback as GetCurrentPosition() isn't called very often (in comparison)
when updating the play bar.  Eventually this should be changed to update the
playbar via a callback to get a position that's a lot more accurate.

Originally committed to SVN as r2798.
 2009-04-15 17:50:16 +00:00
Amar Takhar
b63c2ea27c Add hidden option 'Audio PortAudio Device' to set the default portaudio output device. 
Originally committed to SVN as r2797.
 2009-04-15 11:26:43 +00:00
Amar Takhar
aa85b2eb01 * Fix paCallback decleration 
* Switch from PaOpenDefaultStream to Pa_OpenStream.
* Add Debug output
* Add GetOutputDevices which returns a list of available devices (unused)

Originally committed to SVN as r2796.
 2009-04-15 10:26:22 +00:00
Niels Martin Hansen
558be555e2 Make the default ALSA device default. 
(It should be "default", not "default:0" as the old default was.)

Originally committed to SVN as r2795.
 2009-04-13 17:08:13 +00:00
Amar Takhar
2d6ba0cb22 Move FOUND_AUDIO_PLAYER above the rest of the audio players to preserve 
link ordering.  Also add libaudio_player.a to the final link.

Originally committed to SVN as r2794.
 2009-04-12 10:52:40 +00:00
Amar Takhar
dc34db7f62 Early morning code-o, setting AM_CONDITIONAL _after_ the Makefiles are 
generated isn't going to work very well.

Originally committed to SVN as r2793.
 2009-04-12 10:48:20 +00:00
Amar Takhar
733814793e * Update comment 
* Include audio_player_portaudio2.h instead of audio_player_portaudio.h.

Originally committed to SVN as r2792.
 2009-04-12 10:30:38 +00:00
Amar Takhar
8dab71e974 Split audio_player.cpp into it's own convenience to avoid sending audio library 
CFLAGS to every source file.

Originally committed to SVN as r2791.
 2009-04-12 10:30:07 +00:00
Amar Takhar
95e9ccaf79 Add support for ALSA_(LD|C)FLAGS. 
Originally committed to SVN as r2790.
 2009-04-12 10:28:42 +00:00
Amar Takhar
21460ec589 Add block for WITH_PORTAUDIO2. 
Originally committed to SVN as r2789.
 2009-04-12 10:08:59 +00:00
Amar Takhar
d71cbda47b * s/$found_audio/$found_audio_player/ for clarity. 
* Add AM_CONDITIONAL for FOUND_AUDIO_PLAYER and FOUND_VIDEO_PROVIDER.

Originally committed to SVN as r2788.
 2009-04-12 10:08:28 +00:00
Amar Takhar
579b46f097 Update PortAudio v19 support. 
Originally committed to SVN as r2787.
 2009-04-12 10:04:10 +00:00
Amar Takhar
b89ec65c43 Move the PortAudio v19 check above the v18 check. 
Originally committed to SVN as r2786.
 2009-04-11 23:40:15 +00:00
Amar Takhar
97c857a94f Add 'PortAudio2' as an audio player. 
Originally committed to SVN as r2785.
 2009-04-11 23:23:30 +00:00
Amar Takhar
3247ad6c6c Change WITH_PORTAUDIO -> WITH_PORTAUDIO2 
Originally committed to SVN as r2784.
 2009-04-11 23:18:04 +00:00
Amar Takhar
e61d0b77ac Update audio_player_portaudio2.* for PortAudio v19. 
Originally committed to SVN as r2783.
 2009-04-11 23:16:58 +00:00
Amar Takhar
23eea68fdd Verbatium copy of audio_player_portaudio.* -> audio_player_portaudio2.* 
Originally committed to SVN as r2782.
 2009-04-11 23:15:45 +00:00
Fredrik Mellbin
d39d308d0d FFMS2 GCC compilation fix 
Originally committed to SVN as r2781.
 2009-04-11 19:43:18 +00:00
Fredrik Mellbin
6878e5884a FFMS2 beta 6 (the real commit) 
Requires a recent FFmpeg
Changes the HAALITS define into HAALISOURCE

Originally committed to SVN as r2780.
 2009-04-11 18:45:40 +00:00
Amar Takhar
5f5960ef00 * Fix check for libavutil/pixfmt.h 
* Add detection for PortAudio2 (v19)

Originally committed to SVN as r2779.
 2009-04-11 18:06:23 +00:00
Amar Takhar
26e427e838 Add a check for libavutil/pixfmt.h as a low-brow check for FFMPEG r18129+, this 
needs to be fixed to check exact versions of the library.  For now this should
work.

Originally committed to SVN as r2778.
 2009-04-11 08:13:09 +00:00
Amar Takhar
d642bb37ab Fix an error message to be clearer. 
Originally committed to SVN as r2777.
 2009-04-11 07:51:50 +00:00
Amar Takhar
d0b1ad983e Update libass to r29169 of MPlayer. 
Originally committed to SVN as r2776.
 2009-04-11 07:42:48 +00:00
Karl Blomster
e00fae15d6 Add a -v option to ffmsindex. 
Originally committed to SVN as r2775.
 2009-04-07 01:12:12 +00:00
Karl Blomster
2960b0298c Fix ffms2 video provider to work with new ffms2 version (b6) 
Originally committed to SVN as r2774.
 2009-04-06 20:53:01 +00:00
Karl Blomster
245c91a271 Updated ffms2.lib 
Originally committed to SVN as r2773.
 2009-04-06 20:19:33 +00:00
Karl Blomster
1e47a9d3e5 FFMS2 compile fix for ffmpeg revisions >18129. Probably breaks backwards compatibility so it doesn't compile with older revisions anymore, have fun. 
Originally committed to SVN as r2772.
 2009-04-06 20:15:49 +00:00
Karl Blomster
036da35fe8 Rename a few internal utility functions (FloatToString, IntegerToString, StringToInt, StringToFix) to Aegi* so they do not conflict with identically named wxWidgets functions. Fixes bugtracker issue #819. 
Originally committed to SVN as r2771.
 2009-04-06 20:01:42 +00:00
Karl Blomster
0e299f9146 FFmpegSource2 beta 6, see ffms2.html for change details 
Originally committed to SVN as r2770.
 2009-04-06 19:14:55 +00:00
Karl Blomster
1d69da533c Add new (VSFilter 2.39) override tags to call tips and fix a typo. Patch by Harukalover. 
Originally committed to SVN as r2769.
 2009-03-30 22:10:24 +00:00
Karl Blomster
9bbf4c4281 FFmpegSource2 beta 5. 
Fixes a bug with timecode writing, adds some additional documentation and resolves the issue with reading ffmsindex's progress reporting from another program.

Originally committed to SVN as r2768.
 2009-03-30 22:09:33 +00:00
Rodrigo Braz Monteiro
6106546f74 Fixed windows project. 
Originally committed to SVN as r2766.
 2009-03-14 20:52:01 +00:00
Amar Takhar
01d522b344 * Add a (small) hack for scripts/osx-bundle.sh to handle libtools weirdness. 
* Update path to reflect new repo changes.

Originally committed to SVN as r2765.
 2009-03-13 04:27:24 +00:00
Amar Takhar
2cf7d9c80b Fix auto3 build after repo change. 
Originally committed to SVN as r2764.
 2009-03-13 04:13:11 +00:00
Amar Takhar
b5ab061f02 Fix libass on OSX after the repo changes. 
Originally committed to SVN as r2763.
 2009-03-13 04:12:45 +00:00
Amar Takhar
b2bcb09943 Fix vs2008 build (Patch from Haruka) 
Originally committed to SVN as r2762.
 2009-03-12 05:56:02 +00:00
Amar Takhar
8b21bd2b9f Sync libass with r28935 from MPlayer. 
Originally committed to SVN as r2761.
 2009-03-12 03:46:44 +00:00
Amar Takhar
a9180cfcf7 Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3. 
Originally committed to SVN as r2760.
 2009-03-09 05:48:13 +00:00
Amar Takhar
7740439efd Remove dummy.txt it was used ages ago for testing the svn repository. 
Originally committed to SVN as r2759.
 2009-03-09 01:15:01 +00:00
Amar Takhar
689e353c90 Update the build system for the new repository layout. 
Originally committed to SVN as r2757.
 2009-03-09 00:58:38 +00:00
Amar Takhar
99d2711245 SVN Transition Step 4/7 
1. svn mv auto3 aegisub/src/libauto3
   1. svn mv installer aegisub/packages/win_installer

* See r2749 for full description.

Originally committed to SVN as r2753.
 2009-03-08 08:31:28 +00:00
Amar Takhar
91d73ec8ea SVN Transition Step 3/7 
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
 2009-03-08 08:30:39 +00:00
Amar Takhar
bf730cf96e * Rework the debugging flags to set the variables conditionally on either being 
enabled.
* Fix some cut-and-paste-o's (dunno how I managed these)
* Move AC_SUBST* outside of the conditionally enabled blocks
* Fix typo.

Originally committed to SVN as r2746.
 2009-02-22 22:01:14 +00:00
Amar Takhar
4960863be2 Add --enable-gcov, --enable-efence and --enable-ccmalloc for gcov, Electric 
Fence and ccmalloc support.  gcov support won't work without manual
intervention (for now) but some hooks will be added later to automate it.

Originally committed to SVN as r2745.
 2009-02-22 05:38:46 +00:00
Amar Takhar
761f044526 Return NULL if n < 0 on line 886, for whatever reason on FreeBSD this falls 
through exception handling and causes and abort().

Originally committed to SVN as r2743.
 2009-02-19 23:58:06 +00:00
Amar Takhar
0eaa08c405 Add audio_provider_dummy.cpp to the build which is required when _DEBUG is used. 
Originally committed to SVN as r2739.
 2009-02-17 08:12:19 +00:00
Amar Takhar
8ba90af9cd Add missing files from aegisub/libosxutil/, packages/, and scripts/. 
All of the missing files were related to OS X.

Originally committed to SVN as r2735.
 2009-02-16 00:27:52 +00:00
Niels Martin Hansen
82f91ce1fc Oops, had a C++-style line comment in a C source file 
Originally committed to SVN as r2726.
 2009-02-09 18:10:16 +00:00
Niels Martin Hansen
2bd0ce3055 Updated version of stdint.h for MSVC 
Originally committed to SVN as r2725.
 2009-02-09 18:08:14 +00:00
Karl Blomster
f85ad3c81f Fix the jumpto dialog again. Now sets the max possible number of digits to input based on how many digits are in the final frame number. Patch by Harukalover, solves bugtracker issue #804. 
Originally committed to SVN as r2723.
 2009-02-05 14:48:19 +00:00
Karl Blomster
f530b4c0da Modified Harukalover's patch from yesterday so the frame number is sanitized after entry, not during. 
Originally committed to SVN as r2722.
 2009-02-04 23:22:10 +00:00
Karl Blomster
6a765528e1 Fix a bunch of edge cases in the VFR code. Patch by Plorkyeran, solves bugtracker issue #773. 
Originally committed to SVN as r2721.
 2009-02-04 23:11:56 +00:00
Karl Blomster
d9d0eddfde Minor cosmetic fixes to the goto frame/time dialog box. Patch by Harukalover. 
Originally committed to SVN as r2720.
 2009-02-04 01:45:43 +00:00
Amar Takhar
9c6780a33e * Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking. 
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
  otherwise.

Originally committed to SVN as r2718.
 2009-01-29 21:32:39 +00:00
Amar Takhar
594d44f594 avutil is required on unix/dawrin, not just darwin. 
Originally committed to SVN as r2710.
 2009-01-28 23:34:17 +00:00
Amar Takhar
9a6265afb6 * Switch FFMPEG detection to use pkg-config. 
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.

Originally committed to SVN as r2705.
 2009-01-28 03:19:53 +00:00
Karl Blomster
fe2ec42a45 Fix a really dumb bug in the caching video provider that caused crashes when seeking in the video. 
Originally committed to SVN as r2704.
 2009-01-24 23:00:35 +00:00
Amar Takhar
bd78a5c60e Instead of generating wxicon_xpm.xpm from icon.ico (which is very low-res) 
supply a 48x48 xpm to be included as the application icon.  There's probably a
better way to do this, like figuring out what the typical application icon size
is and supplying different sizes.

Originally committed to SVN as r2702.
 2009-01-24 15:58:38 +00:00
Niels Martin Hansen
4ddc90f027 Simple subtitle formats weren't being split-recombined correctly in some cases after modifications, because AssEntrty::StartMS didn't match AssDialogue::Start, which caused sorting to fail. 
Make a hacky fix that involves setting StartMS to Start.GetMS() when Clone()ing an AssDialogue.

Originally committed to SVN as r2700.
 2009-01-20 20:08:34 +00:00
Amar Takhar
fb557ddf6e Fix restarting aegisub on osx, this uses scripts/osx-bundle-restart-helper.c 
(written by jfs) to restart aegisub when it actually quites using KQUEUE to
monitor the process until it dies then executing /usr/bin/open <bundle_path>

Originally committed to SVN as r2689.
 2009-01-12 22:54:58 +00:00
Amar Takhar
dc83532e02 Fix restarting after lang/options change (RestartAegisub()). 
(this is unix only)

Originally committed to SVN as r2687.
 2009-01-12 21:26:44 +00:00
Amar Takhar
439a2c547e * Only list languages if they're actually installed (checking for the existence 
of the actual .mo file)
* Add ja to the list of possbile translations.

Originally committed to SVN as r2685.
 2009-01-12 21:20:53 +00:00
Amar Takhar
c476b7b883 Add PORTAUDIO_CFLAGS to portaudio static library compile. 
Originally committed to SVN as r2684.
 2009-01-12 00:21:17 +00:00
Karl Blomster
5e6253831a Fix a bug (introduced when support for w64 was added) that caused the PCM provider to never get used. 
Originally committed to SVN as r2682.
 2009-01-10 05:41:56 +00:00
Amar Takhar
1468be9860 Remove a commented line, r2676 had the Darwin paths fix for automation 
snuck in (svn drives me mad sometimes!)

Originally committed to SVN as r2677.
 2009-01-08 08:48:29 +00:00
Amar Takhar
852ceef55d On OS X shared librarys end with .dylib not .so, this fixes the (lame) workaround 
for auto3 linking.

Originally committed to SVN as r2676.
 2009-01-08 08:46:10 +00:00
Amar Takhar
81a168d625 Add a workaround for dependency_libs in auto3/, libtool brings in libraries 
automatically which causes link errors due to auto4 (lua 5.1).

Originally committed to SVN as r2675.
 2009-01-08 08:22:53 +00:00
Amar Takhar
24d52e10c9 Forgot to append /AEGISUB_VERSION_DATA to GetDataDir. 
Originally committed to SVN as r2673.
 2009-01-07 10:40:33 +00:00
Amar Takhar
302f12b472 Add extern "C" around libosxutil.h. 
Originally committed to SVN as r2670.
 2009-01-07 07:35:28 +00:00
Amar Takhar
ab55433c02 Add libres.cpp to EXTRA_DIST for now until I figure out why it's not working 
as it should.

Originally committed to SVN as r2666.
 2009-01-06 14:21:15 +00:00
Amar Takhar
d5f5e66e33 * Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG 
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
  detection.

Originally committed to SVN as r2664.
 2009-01-06 13:59:15 +00:00
Amar Takhar
90062363f3 Really do the aegisub->aegisub-2.1 binary rename. 
Originally committed to SVN as r2663.
 2009-01-06 13:58:21 +00:00
Amar Takhar
bbe33f2b91 Set bin_PROGRAMS to aegisub-2.1 
Originally committed to SVN as r2661.
 2009-01-06 12:35:57 +00:00
Amar Takhar
675c4caa09 Add multiple version support, everything is now suffixed with MAJOR.MINOR, this 
will allow users on unix to install and operate different versions of aegisub a$
the same time.  Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.

Originally committed to SVN as r2659.
 2009-01-06 10:44:49 +00:00
Amar Takhar
2ded1e69db Remove unused files, add config/*.h 
Originally committed to SVN as r2651.
 2009-01-05 11:51:34 +00:00
Amar Takhar
0c6abb553e Remove a cut-and-past-o 
Originally committed to SVN as r2650.
 2009-01-05 11:51:13 +00:00
Amar Takhar
25ca1497ab * Add support for setting the default A/V provider and audio player using 
--with-provider-(video|audio) and --with-player-audio.
* Cleanup --help alignment
* Print default values at the end of configure
* Remove :'s in end status section headings in configure.

Originally committed to SVN as r2648.
 2009-01-05 11:07:14 +00:00
Amar Takhar
37b395310b Add a cheap 'make bundledirs-test' target. 
Originally committed to SVN as r2645.
 2009-01-04 13:07:57 +00:00
Niels Martin Hansen
79b79d737f Add RestartAegisub() function with obvious purpose. 
Replace existing code that restarts Aegisub with a call to that function.

Originally committed to SVN as r2644.
 2009-01-04 11:45:06 +00:00
Niels Martin Hansen
c98c5b10b9 Add (untested) test program for libosxutil, to display what the different locations map to. 
There is no makefile support for it (yet).

Originally committed to SVN as r2643.
 2009-01-04 11:10:51 +00:00
Niels Martin Hansen
00d15ee4db Add OSX_GetBundlePath() to libosxutil 
Originally committed to SVN as r2642.
 2009-01-04 11:09:53 +00:00
Amar Takhar
732970fe56 Set default locale to en_US and disable tooltips on startup, for whatever 
reason both of these break when loading (to be fixed later).

Originally committed to SVN as r2639.
 2009-01-04 10:26:14 +00:00
Amar Takhar
bf09c76081 Remove posix dir and 'libposix' and create 'libresrc' which includes 
resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
 2009-01-04 09:01:49 +00:00
Amar Takhar
e66eed8126 Remove -include posix/defines.h 
Originally committed to SVN as r2625.
 2009-01-04 07:02:28 +00:00
Amar Takhar
7e9f898c34 * Add -I../aegisub to libass/Makefile.am 
* Remove res.h from config/config_unix.h
* Add posix/res.h to config.h (temp)

Originally committed to SVN as r2624.
 2009-01-04 07:01:20 +00:00
Amar Takhar
9238c1b992 Remove WITH_FFMPEGSOURCE as the defines have been self-contained to FFmpegSource2. 
Originally committed to SVN as r2623.
 2009-01-04 06:56:20 +00:00
Rodrigo Braz Monteiro
7b552282ff Fixed config for MSVC 
Originally committed to SVN as r2622.
 2009-01-04 06:42:49 +00:00
Amar Takhar
0763541848 Change how configuration works. 
* move win32/config0.h -> config/config_windows0.h
  * move win32/stdint.h -> msvc/stdint.h
  * move posix/defines.h -> config/config_unix.h
  * add config.h - brings in config_(windows|unix).h as required
  * add config.h to *.cpp
  * Self-contain FFmpegSource2 with required function defines wrapped with
    __UNIX__ instead of the now removed defines.h.
  * Edit aegisub_vs2008.vcproj to remove explicit inclusion of config.h, also
    change VCPreBuildEventTool to create windows_config.h from
    windows_config0.h.  Add msvc to include path.
  * Change configure to create ./acconf.h instead of posix/acconf.h

This will allow us to create a more standard and platform agnostic way of
configuration aegsisub during build time.

Originally committed to SVN as r2621.
 2009-01-04 06:31:48 +00:00
Amar Takhar
da9e5f0cc1 Remove a single debug printf that is no longer required. 
Originally committed to SVN as r2615.
 2009-01-02 09:30:32 +00:00
Amar Takhar
0c7e784d71 Activate locale support on !__WINDOWS__, using SetInstallPrefix in 
standard_paths.cpp allows the program to find the locale files now.

Originally committed to SVN as r2613.
 2009-01-02 08:49:43 +00:00
Amar Takhar
fa5e257ead Sigh, why does 'svn commit .' only work sometimes?: Revert aegisublocale.cpp 
back to r2595.  r2609 (svn:ignore commit) included debuggin code which is
harmless but not required.

Originally committed to SVN as r2610.
 2009-01-02 02:15:32 +00:00
Amar Takhar
3419b99790 Set svn:ignore svn_revision. 
Originally committed to SVN as r2609.
 2009-01-02 02:13:15 +00:00
Amar Takhar
5523314bb2 Change #ifdef __UNIX__ to #if defined(__UNIX__) && !defined(__APPLE__) as 
__UNIX__ is triggered on OS X as well which breaks things when setting
SetInstallPrefix.

Originally committed to SVN as r2608.
 2009-01-01 14:01:45 +00:00
Niels Martin Hansen
31be1e68a2 Just don't show BUILD_CREDIT if it isn't defined, and use an ugly workaround in About box (to avoid clobbering the translateable messages.) 
Originally committed to SVN as r2607.
 2009-01-01 13:16:42 +00:00
Amar Takhar
5b17133fee Use StandardPaths::SetInstallPrefix to set the prefix using INSTALL_PREFIX 
which is taken from configure (either default or with --prefix).  This is the
beginings of proper relocation support on UNIX. (thanks jfs!)

Originally committed to SVN as r2606.
 2009-01-01 13:10:51 +00:00
Rodrigo Braz Monteiro
cd9faac6b0 Possible fix for crash on aegisublocale.cpp 
Originally committed to SVN as r2595.
 2009-01-01 05:37:47 +00:00
Rodrigo Braz Monteiro
77095bab39 UNTESTED - Per verm's request, changed listing of locales for non-Windows to use a hardcoded list. Change this to use a proper txt list later. 
Originally committed to SVN as r2593.
 2009-01-01 02:16:09 +00:00
Niels Martin Hansen
1cce8b4ac7 License headers, documentation comments and changed name of a few functions. (The names were inconsistent.) 
Originally committed to SVN as r2588.
 2008-12-31 09:40:07 +00:00
Amar Takhar
610a6c11cf Sigh, s/Framwork/Framework/ 
Originally committed to SVN as r2587.
 2008-12-31 09:25:11 +00:00
Amar Takhar
1fd3ffc313 Add 'libosxutil' which gives us functions to locate paths within bundles, for 
now this is used by libass to load fontconfig's fonts.conf.

Originally committed to SVN as r2585.
 2008-12-31 09:20:50 +00:00
Niels Martin Hansen
9c04724e13 Fix conversion to multibyte strings from widechar strings in FFmpegSource providers. (tomman) 
Originally committed to SVN as r2582.
 2008-12-31 07:22:24 +00:00
Niels Martin Hansen
234ab505bb Use FINAL_RELEASE define to determine whether to display beta version number or stable version number. (Currently 2.1.6 vs. 2.2.0.) 
Originally committed to SVN as r2579.
 2008-12-31 05:19:24 +00:00
Amar Takhar
954d7282aa * Create packages/osx_bundle which is a skel of OS X bundles. 
* Move aegisub/macosx/*.icns to packages/osx_bundle/Contents/Resources
* Move aegisub/macosx/Info.plist to packages/osx_bundle/Contents/
* Remove aegisub/macosx as it's no longer required.

Originally committed to SVN as r2545.
 2008-12-29 03:22:04 +00:00
Amar Takhar
c30992fbbc Rename macosx/bevelButton* to ./osx_bevelButton*, the macosx/ dir is going away. 
Originally committed to SVN as r2543.
 2008-12-29 02:57:41 +00:00
Amar Takhar
179fd4caa7 Fix mac build, add c_str() to filename and include aegisub.h. 
Originally committed to SVN as r2537.
 2008-12-28 03:07:40 +00:00
Amar Takhar
de6a89c4ed move aegisub/bitmaps/genxpm.awk to scripts/ and edit autogen.sh. 
Originally committed to SVN as r2526.
 2008-12-27 04:50:53 +00:00
Rodrigo Braz Monteiro
a614dd57ea Added .stats to keyframe files. 
Originally committed to SVN as r2508.
 2008-12-20 00:17:17 +00:00
Karl Blomster
6ad406446b Changed how the lavc audio decoder handles non-decodable audio packets. Previously, if decoding failed at any point in the audio stream, it would throw an exception that didn't get caught anywhere and hence crashed the program. Now, it'll just silently skip the broken packet and go on to next one, meaning that if the audio stream is actually corrupted and not just some weird stream with null packets you'll either get desyncs from the missing samples, or if the entire stream is non-decodable you'll just silence. 
tl;dr: Fixed loading of AAC files with the ffmpeg provider.

Originally committed to SVN as r2507.
 2008-12-17 06:22:05 +00:00
Amar Takhar
f36986a072 * Seperate FFMPEG support and FFMPEG/FFmpegSource Provider detection. (PART 1) 
* Fix CSRI detection.
* Fix capitalisation on ending support status.
* s/ANCIENT/OLD/ tag for older FFMPEG headers.
* Fix --enable-old-ffmpeg to work as advertised.

Originally committed to SVN as r2501.
 2008-12-16 01:59:38 +00:00
Niels Martin Hansen
735ce2385e More complete error checking in new DSound player, shouldn't crash/die on errors now. 
Originally committed to SVN as r2496.
 2008-11-27 20:39:36 +00:00
Niels Martin Hansen
a6c169a4b2 Complete rewrite of the DirectSound audio player, this time doing threading and synchronisation better, and following the COM apartment model strictly too. It replaces the old player by default, but the old is still available in the runtime configuration. 
Originally committed to SVN as r2495.
 2008-11-27 18:35:26 +00:00
Rodrigo Braz Monteiro
bfb3f48cba Raised version number. 
Originally committed to SVN as r2494.
 2008-11-26 02:25:35 +00:00
Rodrigo Braz Monteiro
329d8ef9bf Fixed jfs's borkage. (wouldn't compile on VC++) 
Originally committed to SVN as r2493.
 2008-11-26 02:24:37 +00:00
Niels Martin Hansen
42dd599579 Make ffmpeg and ffms video providers endianness-aware and always get the video in pixel format expected by the video display. 
Originally committed to SVN as r2492.
 2008-11-26 02:03:53 +00:00
Rodrigo Braz Monteiro
e802fa3c84 Some more uninitialized variables. 
Originally committed to SVN as r2491.
 2008-11-25 02:07:07 +00:00
Rodrigo Braz Monteiro
6dba041df6 Fixed uninitialized variable (not that it matters) 
Originally committed to SVN as r2490.
 2008-11-25 01:52:35 +00:00
Rodrigo Braz Monteiro
07bc0a91b0 Fixed audio display's slowness. 
Originally committed to SVN as r2488.
 2008-11-25 01:49:17 +00:00
Niels Martin Hansen
0bd7341cfe Updated plist suitable for directly copying into OS X app bundles 
Originally committed to SVN as r2485.
 2008-11-24 20:25:25 +00:00
Niels Martin Hansen
ce99076e80 Get rid of that outdated XCode project, it just causes confusion. 
Originally committed to SVN as r2484.
 2008-11-24 20:07:30 +00:00
Niels Martin Hansen
df4aa2be60 Add a small arrow next to the vertical spectrum (third dimension) in the colour picker, to make it easier to find the cursor in some cases. 
Originally committed to SVN as r2483.
 2008-11-24 14:05:46 +00:00
Rodrigo Braz Monteiro
69d38ba1d6 Updated version to 2.1.5. 
Originally committed to SVN as r2481.
 2008-11-23 02:40:00 +00:00
Rodrigo Braz Monteiro
9c815d3042 Fixed crashing on loading malformed font files. 
Originally committed to SVN as r2479.
 2008-11-23 02:37:25 +00:00
Niels Martin Hansen
f279bc2a14 Crash Aegisub by holding Ctrl or Ctrl+Shift while selecting Bug Tracker from the Help menu. (Cmd instead of Ctrl on Mac.) 
Originally committed to SVN as r2476.
 2008-11-22 19:28:16 +00:00
Niels Martin Hansen
560ea054e9 Fix last-minute test for wx GL support to be compiled it. Thanks to sneshko. 
Originally committed to SVN as r2475.
 2008-11-22 19:07:56 +00:00
Rodrigo Braz Monteiro
8692fe4220 Fixed the typesetting toolbar to fill the whole height of video. 
Originally committed to SVN as r2469.
 2008-11-21 01:49:48 +00:00
Niels Martin Hansen
e924197c48 Make the libass fonts_dir something sensible so it doesn't search the entire homedir (or whereever) through for fonts on init, causing huge delays. 
(?user/libass_fonts/ is used now, it's created if it doesn't exist.)

Originally committed to SVN as r2468.
 2008-11-20 22:08:34 +00:00
Rodrigo Braz Monteiro
dae123d225 Fixed audio spectrum bug. 
Originally committed to SVN as r2463.
 2008-11-17 00:06:31 +00:00
Rodrigo Braz Monteiro
af8d6c6250 Changed version number. 
Originally committed to SVN as r2455.
 2008-11-14 01:37:55 +00:00
Rodrigo Braz Monteiro
e11bd3f659 Optimized the audio display redraw. 
Originally committed to SVN as r2453.
 2008-11-14 01:21:17 +00:00
Rodrigo Braz Monteiro
5ead3d4230 Fixed a bug related to resizing the audio display, that caused the video display to stretch, ruining its aspect ratio. 
Originally committed to SVN as r2438.
 2008-11-09 23:08:44 +00:00
Rodrigo Braz Monteiro
780e3b566c Fixed fonts collector and translation dialogue syntax highlighting. 
Originally committed to SVN as r2433.
 2008-11-09 01:18:15 +00:00
Rodrigo Braz Monteiro
f46200a3b6 A few more tweaks to progress dialog. 
Originally committed to SVN as r2429.
 2008-10-29 00:18:13 +00:00
Rodrigo Braz Monteiro
acfb815484 Semi-fix for ffms2 
Originally committed to SVN as r2428.
 2008-10-28 04:39:10 +00:00
Rodrigo Braz Monteiro
453f3ad816 Originally committed to SVN as r2427. 2008-10-28 04:24:45 +00:00
Rodrigo Braz Monteiro
61dc57d0e1 Fixed progress dialog and ffmpegsource providers. 
Originally committed to SVN as r2426.
 2008-10-28 04:03:29 +00:00
Amar Takhar
2b13dfbb43 Add support for FFmpegSource2, it's enabled by default if libpostproc is there. 
Originally committed to SVN as r2425.
 2008-10-28 02:18:14 +00:00
Karl Blomster
94975c6869 ignore error if the ffms index file can't be written 
Originally committed to SVN as r2424.
 2008-10-28 01:39:42 +00:00
Rodrigo Braz Monteiro
fdc7d2fd93 Updated about dialog and options. 
Originally committed to SVN as r2420.
 2008-10-28 00:08:52 +00:00
Rodrigo Braz Monteiro
4815c6fd34 Updated version number. 
Originally committed to SVN as r2417.
 2008-10-27 22:34:36 +00:00
Rodrigo Braz Monteiro
8ccb37d3db Removed distinction between normal and recommended video formats. 
Originally committed to SVN as r2416.
 2008-10-26 19:18:52 +00:00
Niels Martin Hansen
d291871460 Revert r2210 and r2201 because those fixes to DSound player seemed to just make things more unstable. 
A complete rewrite of the DSound player might follow later.

Originally committed to SVN as r2415.
 2008-10-22 22:31:43 +00:00
Karl Blomster
6dd79d7441 fix an oddness with the "insert before" function. patch by Harukalover. 
Originally committed to SVN as r2413.
 2008-10-11 13:28:29 +00:00
Karl Blomster
2d49a1e833 we don't need to #include lavc_file.h twice 
Originally committed to SVN as r2412.
 2008-10-10 15:30:28 +00:00
Karl Blomster
fd8a7750c7 Update ffms2 providers to work with latest ffms2 API. Also fixes a few error messages. 
Originally committed to SVN as r2408.
 2008-10-01 22:08:28 +00:00
Karl Blomster
00265d6ec4 change the ffmpeg includes to libav*/*.h for good this time, but you can still define WITH_OLD_FFMPEG to get the old includes. 
Originally committed to SVN as r2398.
 2008-09-28 13:02:25 +00:00
Karl Blomster
dde0214246 change __stdcall to FFMS_CC, should improve portability 
Originally committed to SVN as r2397.
 2008-09-28 00:52:19 +00:00
Karl Blomster
e247cc290e update ffms2 providers to account for latest API breakage and rename ffmpegsource2.lib to ffms2.lib in setup.cpp 
Originally committed to SVN as r2395.
 2008-09-28 00:40:37 +00:00
Karl Blomster
a2c5b5778c eol-style native on new files, also add said new files to Makefile.am 
Originally committed to SVN as r2388.
 2008-09-24 11:27:42 +00:00
Karl Blomster
8ecedcbc2d Update ffms providers to use new and improved FFMS API functionality. 
Also moved the indexing function to ffmpegsource_common.cpp.

Originally committed to SVN as r2387.
 2008-09-23 23:30:27 +00:00
Karl Blomster
fabcd033b0 ffms2 providers: better error messages 
Originally committed to SVN as r2382.
 2008-09-23 21:06:11 +00:00
Karl Blomster
4a94fa334d use wxConvFile for filenames in the ffms providers 
Originally committed to SVN as r2380.
 2008-09-23 20:28:57 +00:00
Karl Blomster
8107d0c1a9 Add new ffms2 audio provider. Only works with matroska so far, also probably buggy. 
Originally committed to SVN as r2379.
 2008-09-23 20:02:21 +00:00
Karl Blomster
eab0784d77 A few bugfixes to the FFMS2 video provider, also moved some common functions to ffmpegsource_common.cpp/.h in preparation for the FFMS2 audio provider. 
Originally committed to SVN as r2378.
 2008-09-23 20:01:11 +00:00
Karl Blomster
9b4f389fb2 ffmpegsource video provider now cleans up after itself properly even if loading the video file failed 
Originally committed to SVN as r2373.
 2008-09-23 01:19:31 +00:00
Karl Blomster
743527eeb8 fix a bug in the OpenAL audio player where it would crash if you tried to stop playback by moving the line end marker to before the playback cursor. credits to jfs. 
Originally committed to SVN as r2364.
 2008-09-18 23:14:12 +00:00
Rodrigo Braz Monteiro
14037b8a64 Fixed last patch and updated project. 
Originally committed to SVN as r2353.
 2008-09-14 15:20:15 +00:00
Rodrigo Braz Monteiro
d8c5da67d8 Added support for drawing of \iclip on visual tools, but no button to invert it yet. 
Originally committed to SVN as r2352.
 2008-09-14 15:17:14 +00:00
Niels Martin Hansen
e7ed19e55a Add some basic support for Sony's Wave64 format. 
Originally committed to SVN as r2342.
 2008-09-10 23:02:40 +00:00
Rodrigo Braz Monteiro
df3a25129e Fixed project and other stuff for ffmpegsource support. 
Originally committed to SVN as r2341.
 2008-09-10 22:01:35 +00:00
Karl Blomster
0026ba38ec Fix ffmpegsource video provider to no longer depend on ffmpeg directly, everything is now done by API calls to the ffmpegsource DLL. 
Originally committed to SVN as r2340.
 2008-09-10 21:05:54 +00:00
Niels Martin Hansen
d92efd1f54 Work around bug #772, v1 timecodes files with overlapping or out of order ranges caused weird behaviour. Now those files are simply rejected. 
Originally committed to SVN as r2339.
 2008-09-10 20:52:51 +00:00
Niels Martin Hansen
e737471043 Implement aegisub.video_size() function in Automation 4 Lua. Returns nil if no video is loaded, otherwise returns xres,yres,ar,artype. 
Originally committed to SVN as r2337.
 2008-09-10 16:53:23 +00:00
Niels Martin Hansen
30a0b7e82b Add support for new override tags: \iclip \fax \fay \xshad \yshad \xbord \ybord \blur 
Support redefined override tags: \move (float-pos) \pos (float-pos) \be (variable)
Make visual typesetting understand inverse clips and edit them correctly.
Make vector clip visual tool able to convert a rectangular clip to a vector clip.
What's missing: Proper rendering of inverse vector clips in visual tool overlay.

Originally committed to SVN as r2336.
 2008-09-10 16:13:54 +00:00
Niels Martin Hansen
aca234ebcc Fix bugs #775 and #776, missing initialisation of controls in Auto4 Lua dialogues. (Untested.) 
Originally committed to SVN as r2335.
 2008-09-10 14:56:29 +00:00
Niels Martin Hansen
f89b9d6c43 Fix incorrect type for Windows x64 builds. 
Originally committed to SVN as r2334.
 2008-09-10 14:45:46 +00:00
Karl Blomster
e702d9edca fixed the ffmpegsource indexing progress dialog to work with files larger than 4gb. 
Originally committed to SVN as r2330.
 2008-09-07 19:15:12 +00:00
Karl Blomster
ff6876b412 Fix a crash when using detached video and pressing the up/down arrows with the video slider selected. Patch by ai-chan. 
Originally committed to SVN as r2329.
 2008-09-07 03:22:35 +00:00
Karl Blomster
91e1fb7f06 Fix a crash when importing styles with names identical to ones existing on the script but with different case (they are now overwritten properly). Special thanks to ai-chan. 
Originally committed to SVN as r2327.
 2008-09-06 11:35:36 +00:00
Karl Blomster
dafc9dfe73 fix a crash when saving screenshots with a non-english locale set. patch by Manta. 
Originally committed to SVN as r2326.
 2008-09-06 09:33:14 +00:00
Karl Blomster
02ce1e72df missed one line when removing the useless stuff 
Originally committed to SVN as r2325.
 2008-09-06 02:57:09 +00:00
Karl Blomster
c72cb5f505 kill another useless cast 
Originally committed to SVN as r2324.
 2008-09-06 02:54:22 +00:00
Karl Blomster
0add56bfa0 remove some useless casts 
Originally committed to SVN as r2323.
 2008-09-06 02:50:20 +00:00
Karl Blomster
728b0d0a93 cleanup of unused and useless code in video_provider_lavc.cpp 
Originally committed to SVN as r2322.
 2008-09-06 02:49:58 +00:00
Karl Blomster
df3512e8eb add video_provider_ffmpegsource.cpp to Makefile.am 
Originally committed to SVN as r2321.
 2008-09-05 19:07:31 +00:00
Karl Blomster
82059cbfe2 add some support for sample formats other than 16-bit int to the lavc audio provider. untested and will probably break spectacularly. 
Originally committed to SVN as r2320.
 2008-09-05 12:55:45 +00:00
Karl Blomster
c28b96b502 add decoding threads option for the ffmpegsource video provider 
Originally committed to SVN as r2319.
 2008-09-05 12:53:57 +00:00
Karl Blomster
1655f97a59 add a progress dialog to the ffmpegsource video provider's indexing process 
Originally committed to SVN as r2318.
 2008-09-04 22:17:34 +00:00
Karl Blomster
5acd3b2534 revert back to including ffmpeg/libav*.h 
Originally committed to SVN as r2316.
 2008-09-04 18:26:15 +00:00
Karl Blomster
b2153dd6cf add option for ffmpegsource thread count and seek mode 
Originally committed to SVN as r2314.
 2008-09-03 21:22:33 +00:00
Karl Blomster
3e13ef206f fix vfr handling for the ffmpegsource video provider, entire thing should be considered working now 
Originally committed to SVN as r2313.
 2008-09-03 21:03:18 +00:00
Karl Blomster
98341f62be add vfr handling (broken) and keyframe reading (works) to the ffmpegsource video provider 
Originally committed to SVN as r2312.
 2008-09-03 20:27:50 +00:00
Karl Blomster
d8c8d47e4c new video provider: ffmpegsource 
Originally committed to SVN as r2310.
 2008-09-03 17:03:20 +00:00
Karl Blomster
bf931df635 fix retarded breakage in previous commit. 
Originally committed to SVN as r2304.
 2008-08-14 23:49:11 +00:00
Karl Blomster
d1c62c1324 Fix crash on playing video without audio loaded when using the ffmpeg providers. Patch by Manta with minor modifications by me. 
Originally committed to SVN as r2303.
 2008-08-14 16:10:31 +00:00
Karl Blomster
620cf44c46 sourced some error messages in the lavc video provider 
Originally committed to SVN as r2302.
 2008-08-14 16:06:04 +00:00
Niels Martin Hansen
8129285630 Fix #759, correctly merge lines with identical text when exporting to simple subtitle formats. 
Originally committed to SVN as r2301.
 2008-08-11 00:02:36 +00:00
Karl Blomster
5b38a17529 replace a bunch of magic numbers (2) with bytes_per_sample 
Originally committed to SVN as r2297.
 2008-08-04 08:17:35 +00:00
Karl Blomster
217c228738 misc small fixes in the ffmpeg audio provider, preparation for support of other sample formats than just 16-bit int 
Originally committed to SVN as r2296.
 2008-08-04 07:13:41 +00:00
Karl Blomster
bc675ea7dd explicitly tell swscaler which scaling method to use (required by newer ffmpeg versions; no actual scaling is done, only colorspace conversion) 
Originally committed to SVN as r2294.
 2008-08-03 16:52:54 +00:00
Niels Martin Hansen
7342c2b617 Fix search/replace deleting part of line following the last match on that line. Also a minor optimisation. 
Originally committed to SVN as r2280.
 2008-07-23 16:09:27 +00:00
Niels Martin Hansen
c3c29518d4 Untested patch: Remove all traces of the update checker from non-Windows builds, since it causes more problems than it solves on those. 
Originally committed to SVN as r2277.
 2008-07-22 20:55:24 +00:00
Niels Martin Hansen
741476c96d Correct spelling error 
Originally committed to SVN as r2274.
 2008-07-22 00:33:25 +00:00
Niels Martin Hansen
7b110725d1 Oops, r2270 broke the build, missing a backslash in a string. 
Originally committed to SVN as r2271.
 2008-07-20 13:45:10 +00:00
Niels Martin Hansen
30a9bdc17c Implement/fix #751 and update changelog a bit. 
Originally committed to SVN as r2270.
 2008-07-20 13:34:42 +00:00
Niels Martin Hansen
eb5e8ea8a1 Corrections for TranStation export support. Format written was incorrect (a space placed on the wrong side of a bracket). Also added full support for alignments, and subtracting one frame from end times to avoid overlaps 
Originally committed to SVN as r2269.
 2008-07-18 21:10:48 +00:00
Niels Martin Hansen
94011adf93 Fix SMPTE timecode formatting, never round frame up to avoid things like frame 30 in a second in a 30 fps movie, where frame numbers go from 0 to 29. 
Originally committed to SVN as r2268.
 2008-07-18 20:43:07 +00:00
Niels Martin Hansen
270ca4f876 Rewrite recombining of overlapping lines for export to simple subtitle formats, and reorganisation of other functions also used in those exports 
Originally committed to SVN as r2267.
 2008-07-18 15:39:34 +00:00
Rodrigo Braz Monteiro
2d7b2527a7 OMFG AMZ IS ALIVE! Partial TranStation export support (SMPTE drop-frames seem to be broken, and line merging isn't working) 
Originally committed to SVN as r2266.
 2008-07-18 01:36:20 +00:00
Karl Blomster
0badb4059f Restructured audio providing a bit. If a provider cannot provide 16-bit mono audio with a sample rate higher than 32kHz, an intermediate converting provider will be inserted to fix it. Made the lavc audio provider rely on this for downmixing instead of doing it with libavcodec (used to fail on audio with >2 channels). 
Originally committed to SVN as r2265.
 2008-07-16 13:22:06 +00:00
Niels Martin Hansen
2bd33541c1 Fix #745 by explicitly setting the font name combo box value after filling it 
Originally committed to SVN as r2264.
 2008-07-16 12:10:00 +00:00
Niels Martin Hansen
624eb825a7 Fix #746, style editor now shows initial values in spin controls 
Originally committed to SVN as r2263.
 2008-07-16 11:30:53 +00:00
Niels Martin Hansen
dfa3e548a0 Fix colour picker buttons in style editor by making AssColor::GetWXColor() aware that alpha has the opposite meaning in wxColour and ASS 
Originally committed to SVN as r2262.
 2008-07-16 01:41:33 +00:00
Niels Martin Hansen
27e35e9434 Fix current colour display in colour picker dialogue 
Originally committed to SVN as r2261.
 2008-07-16 01:36:38 +00:00
Niels Martin Hansen
9c51d15a99 Fix recent colours box in colour picker on Mac 
Originally committed to SVN as r2260.
 2008-07-16 01:29:36 +00:00
Karl Blomster
e8dffb60ec add audio_provider_downmix.cpp to Makefile.am 
Originally committed to SVN as r2259.
 2008-07-15 22:49:02 +00:00
Karl Blomster
6bec0322e4 split out the downmixing audio provider into its own .h/.cpp, in preparation for using it in the ffmpeg audio provider. 
Originally committed to SVN as r2257.
 2008-07-15 21:31:09 +00:00
Niels Martin Hansen
d120a4758b Fix bug #742 and possibly also #465. Needs testing on non-Mac platforms to see if there's visual glitches with video visual typesetting toolbar. 
Originally committed to SVN as r2256.
 2008-07-15 17:49:15 +00:00
Karl Blomster
a836b89476 cosmetics and cleanup of unused code in video_provider_lavc.cpp 
Originally committed to SVN as r2255.
 2008-07-15 14:35:22 +00:00
Karl Blomster
904873f0d9 added option to allow potentially unsafe seeking with the ffmpeg video provider. named "ffmpeg allow unsafe seeking" and defaults to false. 
Originally committed to SVN as r2254.
 2008-07-15 14:24:00 +00:00
Karl Blomster
cdb2227024 unbroke compilation of the directshow video provider, broke with last commit. Patch by Harukalover. 
Originally committed to SVN as r2253.
 2008-07-15 12:44:53 +00:00
Karl Blomster
893ff2f78a Major rewrite of the video providing system. Hilights: 
- It is now the responsibility of each video provider to provide a list of keyframe positions and (if it can) timecodes.
- The ffmpeg video provider now indexes files before opening them and does no longer rely on stream->duration to determine the number of frames. Fixes opening of MKV files, but it does not (currently) open timecodes automatically and reported keyframe positions seem way off. Status of frame-accuracy with MKV files unknown but it may very well work.
- Modified the way the ffmpeg video provider seeks (inspired by code from Myrsloik's ffmpegsource). Should no longer lose the first frame and should also no longer be frame-inaccurate, at least not with AVI.
- DirectShow video provider may or may not be completely broken, not tested.

Originally committed to SVN as r2252.
 2008-07-15 00:08:05 +00:00
Karl Blomster
7e2b6afdf1 typo fix (patch by Harukalover) 
Originally committed to SVN as r2251.
 2008-07-14 22:56:49 +00:00
Karl Blomster
11f316c180 cosmetics and minor adjustments to ffmpeg keyframe reader 
Originally committed to SVN as r2249.
 2008-07-14 00:07:21 +00:00
Karl Blomster
32f7a53a68 vastly improved keyframe reading with ffmpeg, should be much faster and more reliable. 
Originally committed to SVN as r2248.
 2008-07-13 23:45:42 +00:00
Niels Martin Hansen
32cc996ce6 Harukalover's patch for bug #740 
Originally committed to SVN as r2246.
 2008-07-13 15:06:29 +00:00
Karl Blomster
46a6924531 added support for DivX (6.x and possibly 5.x) and x264 2-pass stats file to keyframe reader. 
patch by Harukalover, see bugtracker issue #736.

Originally committed to SVN as r2244.
 2008-07-09 16:48:19 +00:00
Niels Martin Hansen
923b347356 Some more checking in PCM provider. Had apparently missed a way EnsureRangeAceesibleble() could fail. This means of failure should no longer be possible. 
Originally committed to SVN as r2240.
 2008-07-05 12:50:49 +00:00
Karl Blomster
51c9856160 clarified downmixing error in ffmpeg audio provider 
Originally committed to SVN as r2239.
 2008-07-05 11:29:42 +00:00
Niels Martin Hansen
484a179798 Forgot to change the include guard when renaming the file, so <endian.h> defined _ENDIAN_H on some systems and thus aegisub_endian.h had no effect. 
Originally committed to SVN as r2238.
 2008-07-04 12:36:10 +00:00
Niels Martin Hansen
3d13fcfe5f Fix some minor warnings when building on GCC. 
Originally committed to SVN as r2237.
 2008-07-04 12:34:02 +00:00
Karl Blomster
e26b9fe0d5 overhaul of audio_provider_lavc.cpp. should fix the infamous skewing issue, tested and works on windows at least. 
Originally committed to SVN as r2236.
 2008-07-04 12:04:10 +00:00
Niels Martin Hansen
d01b4ec3e9 Yet some more sanity/error checking, although it should never be triggered. 
Originally committed to SVN as r2235.
 2008-07-04 11:59:28 +00:00
Niels Martin Hansen
0d56463aa4 A bit additional commenting and sanity checking in PCM provider. 
Originally committed to SVN as r2234.
 2008-07-04 11:37:45 +00:00
Karl Blomster
a1574d0a5f milisecond -> millisecond (patch by harukalover) 
Originally committed to SVN as r2233.
 2008-07-04 03:40:57 +00:00
Niels Martin Hansen
155388b456 Add secret option to disable use of the PCM provider, mainly intended for debugging: "Audio Disable PCM Provider" (default is false ie. PCM provider enabled) 
Originally committed to SVN as r2232.
 2008-07-04 03:24:25 +00:00
Niels Martin Hansen
2c7da25e91 Avoid strncmp() for checking fourCC codes and use a handcrafted function for it instead. Also add some assertions for null pointer checks. 
Originally committed to SVN as r2231.
 2008-07-04 03:06:55 +00:00
Niels Martin Hansen
a4fc3e8b13 Use compiler-specific defines when building universal for OS X to detect correct endianness and avoid using dynamic endian code for no reason. 
Originally committed to SVN as r2230.
 2008-07-04 01:05:16 +00:00
Karl Blomster
075bc5ec75 revert r2216 (changes to the libav* includes) 
Originally committed to SVN as r2228.
 2008-07-04 00:20:14 +00:00
Niels Martin Hansen
5c2e749421 Forgot to inline the dynamic endian code. 
Originally committed to SVN as r2227.
 2008-07-03 23:38:44 +00:00
Karl Blomster
910ff2e34e the "impossible" audio error is now really impossible 
Originally committed to SVN as r2226.
 2008-07-03 23:27:06 +00:00
Niels Martin Hansen
0fbe0a001f Don't use uint32_t in functions working on uint64_t, shifting uint32_t by 56 bits causes evil compiler warnings. On some compilers! 
Originally committed to SVN as r2225.
 2008-07-03 23:24:47 +00:00
Karl Blomster
d6ada6f0bd black magic for building with ffmpeg on windows 
Originally committed to SVN as r2224.
 2008-07-03 15:22:25 +00:00
Niels Martin Hansen
d1b8355ff2 Rename endian.h to aegisub_endian.h to avoid clash with system headers on some systems. 
Originally committed to SVN as r2223.
 2008-07-03 13:35:23 +00:00
Niels Martin Hansen
a7b64fe694 Make PCM WAV reading (almost) machine endian neutral. The actual sample data read are still assumed to be in machine endian, which will produce garbage output on big endian archs. 
Originally committed to SVN as r2222.
 2008-07-03 02:22:18 +00:00
Niels Martin Hansen
8384e83e71 Add functions to address endianness problems. 
The configure.in script should be adjusted to define appropriate preprocessor tokens. Windows developers should update their config.h.

Originally committed to SVN as r2221.
 2008-07-03 01:56:26 +00:00
Niels Martin Hansen
67bfd70f82 Add a function to remove items from MRU lists, in preparation for a fix for #717. Also a bit of prettyfication of the MRU handling code. 
Originally committed to SVN as r2220.
 2008-07-03 01:53:22 +00:00