b127105f42
Remove extra FFmpegSourceProvider:: qualifier.
...
Originally committed to SVN as r3212.
2009-07-23 03:16:57 +00:00
7157d50e73
Re-fix the VFR fix in r3084 by restoring the old behavior (which was correct for the only existing providers at the time it was implemented, I think) under a special condition that only triggers for the AVS provider. This does not really actually fix any bugs; the new behavior wasn't any better (in fact it was probably incorrect in some cases) but at least this way doesn't have any of the regressions the new way might have introduced.
...
Originally committed to SVN as r3211.
2009-07-23 02:06:47 +00:00
0475b95e60
Further removal of traces of Auto4 Perl and Ruby. (Is this some Pokemon game?)
...
Updates #930 .
Originally committed to SVN as r3210.
2009-07-23 01:57:53 +00:00
bec9378182
Remove video_provider_dshow.cpp from EXTRA_SOURCES in Makefile.am. Updates #930 .
...
Originally committed to SVN as r3209.
2009-07-23 01:46:11 +00:00
c6145f0b63
I don't know why there were .pm files under data_general.. updates #840 and #938 .
...
Originally committed to SVN as r3208.
2009-07-23 01:45:11 +00:00
f35b48470a
Seems Fluff forgot to remove some files from MSVC project when removing DShow video provider. Updates #930 .
...
Originally committed to SVN as r3207.
2009-07-23 01:43:58 +00:00
07900b05f0
Oops, build-breaker = me. Forgot to save MSVC project before committing so the removed property sheet was still referenced. Updates #938 .
...
Originally committed to SVN as r3206.
2009-07-23 01:41:48 +00:00
31657f94da
The removal of Auto4 Ruby and Auto4 Perl code. Updates #665 and #938 .
...
Originally committed to SVN as r3205.
2009-07-23 01:39:57 +00:00
af5df13f00
Remove Auto4 Ruby from the (unix) build system, updates #665 and #938 .
...
Originally committed to SVN as r3204.
2009-07-23 01:23:35 +00:00
3403a5faea
Remove Auto4 PERL from the build system, updates #840 and #938 .
...
Originally committed to SVN as r3203.
2009-07-23 01:18:51 +00:00
d8c7515975
Remove a few auto3 files that wern't associated with auto3 in the Makefile.
...
Originally committed to SVN as r3202.
2009-07-23 01:11:27 +00:00
3b917f61bf
Fix a warning on GCC about initialisation order in Aegisub::Exception class.
...
Originally committed to SVN as r3201.
2009-07-23 01:11:22 +00:00
c52d45dd95
Missed a bunch of things removing Auto3...
...
Originally committed to SVN as r3200.
2009-07-23 00:49:54 +00:00
dbf0f48713
Nuke auto3 from the Unix/OSX build system.
...
Originally committed to SVN as r3199.
2009-07-23 00:27:57 +00:00
2fef9e3111
Remove libauto3 that somehow escaped before.
...
Originally committed to SVN as r3198.
2009-07-23 00:22:57 +00:00
98d909b361
Remove Auto3 from Windows buildbot solution file, should unbreak that.
...
Originally committed to SVN as r3197.
2009-07-23 00:22:20 +00:00
be26ba4652
Surgically remove Automation 3.
...
Going to break UNIX build and Windows buildbot for now.
Originally committed to SVN as r3196.
2009-07-23 00:19:36 +00:00
352df194aa
Remove the DirectShow VideoProvider. Fixes #930 .
...
Originally committed to SVN as r3195.
2009-07-23 00:12:22 +00:00
5e902e2ef1
Remove threaded-ness of Auto 4 Lua macro validation calls, updates #927 .
...
Originally committed to SVN as r3194.
2009-07-22 23:07:46 +00:00
520239fc1b
Re-do "split by karaoke" code using the common ass_karaoke code and adding a little more sanity checking, fixes #929 .
...
Originally committed to SVN as r3192.
2009-07-22 22:30:57 +00:00
ac33243a49
Fixed compilation with wxWidgets 2.9.0 again plus removed some unneeded #if's (wc_str is the same as c_str under 2.8)
...
Originally committed to SVN as r3191.
2009-07-22 19:52:59 +00:00
ff8c8e1817
Add exception.h declaring some base exception classes. For the sake of experimenting and showing the concept, change one (probably never thrown) exception to use the new style exceptions.
...
No new source files to compile, just a new header.
Originally committed to SVN as r3190.
2009-07-22 00:10:36 +00:00
8d5bae9558
Forgot to call Close() in the QT video provider's destructor.
...
Originally committed to SVN as r3189.
2009-07-21 21:04:38 +00:00
38c5f8200a
Removed FFMS2 usage from the Avisynth video provider. If you want FFMS2, use the FFMS2 provider.
...
Originally committed to SVN as r3188.
2009-07-21 20:36:27 +00:00
ce2a549517
Implemented a basic QuickTime video provider. Works in my simple tests on Windows, but I have no idea if it even compiles on Mac.
...
I leave it up to verm to add detection for it to configure; it's disabled by default (#ifdef'd out unless you #define WITH_QUICKTIME).
Originally committed to SVN as r3187.
2009-07-21 20:24:25 +00:00
d1762c5270
The Great Colorspace Reworking of '09, part 2 of ???: change all video providers to always output RGB32, and remove the formatMask parameter of GetFrame(). This may break the dshow video provider but I have no way of testing it and AFAIK nobody else does either. If someone actually uses it, they can fix it themselves. Updates #926 .
...
Originally committed to SVN as r3185.
2009-07-20 03:50:25 +00:00
eae6fea9d9
The Great Colorspace Reworking of '09, part 1 of ???: remove all traces of the YV12->RGB32 OpenGL shader program, as it was very broken and nobody ever used it. Updates #926 .
...
Originally committed to SVN as r3180.
2009-07-20 01:32:01 +00:00
17abf6965e
Remove some useless commented-out code and an unused variable in video_context.cpp; neither have been used since Moses crossed the Red Sea.
...
Originally committed to SVN as r3179.
2009-07-20 00:45:11 +00:00
9ff3762eaf
Removed the extremely deprecated fps parameter of the video provider constructors, since it hasn't been used by anything for years and was of questionable utility when it actually was used in the Elder Days.
...
Originally committed to SVN as r3178.
2009-07-20 00:39:38 +00:00
9e150d282d
Cosmetics in the y4m video provider
...
Originally committed to SVN as r3177.
2009-07-19 22:51:19 +00:00
c329c4e047
Update to 9ad13b from the libass git repo. ( http://greg.geekmind.org/viewgit/ ) This change also includes the ability to split off fontconfig cache updating into it's own step so dialogues can be used to warn the user about the font cache being updated (it can take several mins on slow machines with lots of fonts). Updates #841
...
Originally committed to SVN as r3176.
2009-07-19 19:33:29 +00:00
ee537d06f6
Add missing <wx/filename.h> and <wx/log.h> headers.
...
Originally committed to SVN as r3175.
2009-07-19 18:50:27 +00:00
2ef6260938
Move +AM_PROG_CC_C_O after AC_PROG_CC to silence automake 1.10
...
Originally committed to SVN as r3169.
2009-07-19 18:33:08 +00:00
2b2a7f4212
Implement a YUV4MPEG video provider. (YUV4MPEG is an uncompressed video format originally created for use by mjpegtools but is also commonly used by a lot of Unix video software; see http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 or http://manpages.ubuntu.com/manpages/karmic/en/man5/yuv4mpeg.5.html (man 5 yuv4mpeg, if you have mjpegtools installed) for a description of the format.)
...
Currently lacks a few features (no RFF flag parsing is done, interlacing is not supported and the colorspace conversion to RGB32 could stand considerable improvement) but at least now Aegisub is capable of reading video without FFMS2 or Avisynth. Updates #920 .
Originally committed to SVN as r3168.
2009-07-19 04:13:46 +00:00
ff0787d29c
Updated German translation (fixes some typos etc) by Sebastian Billau (sebastian u billau a web d de). This translation update should be backported into 2.1.8.
...
Originally committed to SVN as r3165.
2009-07-18 21:00:57 +00:00
c6a5ff07d7
Fix a very embarrassing bug (I mixed up the track masks in r3155).
...
Originally committed to SVN as r3164.
2009-07-18 20:03:32 +00:00
c02f953ee0
Made the style sorting code only append each style once even when multiple styles have the same name. Closes #922 .
...
Originally committed to SVN as r3163.
2009-07-18 04:37:43 +00:00
0fa0d9d17e
Add some parentheses for clarity.
...
Originally committed to SVN as r3162.
2009-07-18 03:58:22 +00:00
6608ff47b5
Made the check for duplicate style names when creating or editing styles case insensitive. Closes $777.
...
Originally committed to SVN as r3161.
2009-07-18 03:45:16 +00:00
a7d0b591f8
Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922 .
...
Originally committed to SVN as r3160.
2009-07-18 02:52:46 +00:00
c2087304fc
A few minor cleanups to the new charset conversion code.
...
Originally committed to SVN as r3159.
2009-07-18 00:58:13 +00:00
779dcadc69
Add missing fixes for libauto3 to Makefile.am and commit the actual changes to libauto3/
...
Originally committed to SVN as r3158.
2009-07-17 20:58:45 +00:00
e2e859b8f4
Exit with the previous commands exit status incase it failes: In this case copying the aegisub binary into the bundle.
...
Originally committed to SVN as r3157.
2009-07-17 19:52:08 +00:00
51c7ead1b8
s/2_1/2_2/ in Makefile.am This is required for two reasons:
...
* Aegisub is monolithic
* Automakes idea of sending flags to specific files is in creading 17,000 different libraries (which beacuse of point #1.)
Originally committed to SVN as r3156.
2009-07-17 19:50:59 +00:00
58539b885d
Replace FFMSTrackMask[All|None] with #defines instead. (Was causing linking problems with some compilers for some reason).
...
Originally committed to SVN as r3155.
2009-07-16 21:40:17 +00:00
8af125b88c
Remove FFMPEG files from _SOURCES -- these shouldn't have been here in the first place. Updates #921 .
...
Originally committed to SVN as r3154.
2009-07-16 20:03:47 +00:00
62b036ac35
Fix accidental inclusion of test code in last commit.
...
Originally committed to SVN as r3153.
2009-07-16 19:25:43 +00:00
8087622edd
Fix an ancient bug in the ffms2 video provider that caused access violations when trying to output YV12 images. Nobody discovered this before because nobody tried to use YV12.
...
Originally committed to SVN as r3152.
2009-07-16 19:20:14 +00:00
fb8196dcf8
Chase r3148 and r3149 and remove the FFMPEG video provider from the unix build system. Updates #921 .
...
Originally committed to SVN as r3150.
2009-07-16 19:16:31 +00:00
cdc69b847f
Remove the deprecated ffmpeg providers from the MSVC2008 project file.
...
Originally committed to SVN as r3149.
2009-07-16 19:11:00 +00:00
dfea9f9713
Remove the deprecated ffmpeg audio/video providers. They have not yet been removed from any of the build systems; verm will remove them from the Unix one and I will remove them from the MSVC project file shortly.
...
Originally committed to SVN as r3148.
2009-07-16 19:08:40 +00:00
e589bceaa6
The caching video provider should not force RGB32. Nobody really cared about this because Aegisub always uses RGB32 unless you flip secret switches and whatnot, but it's not right and other colorspaces may be used in the future.
...
Originally committed to SVN as r3147.
2009-07-16 18:50:16 +00:00
491fa10ff1
Fix a regression introduced by Plorkyeran's iconv patch that caused the text file reader to throw an exception when trying to read an empty file.
...
Originally committed to SVN as r3146.
2009-07-16 15:10:40 +00:00
c33ed91b12
Implement support for multiple tracks in the FFMS2 audio and video providers. Files with more than one audio or video track will now let the user pick which one he/she wishes to load. Closes #905 .
...
Originally committed to SVN as r3145.
2009-07-16 14:48:47 +00:00
5cb4d1cae3
Revert r3137 for video_provider_ffmpegsource.cpp; the patch fixed an issue that had already been fixed (by using UTF8 instead of the local codepage).
...
Originally committed to SVN as r3144.
2009-07-15 04:02:15 +00:00
ece75e0652
Make version checker include current version (source SVN revision) in request for latest.txt, for statistics purposes.
...
Originally committed to SVN as r3140.
2009-07-14 23:23:39 +00:00
b2c1eced55
Make the name of the limit to visible lines export filter translatable. Fixes #789 .
...
Originally committed to SVN as r3139.
2009-07-14 22:29:38 +00:00
24de0a249a
Add missing iconv include dir to MSVC project property sheet.
...
Originally committed to SVN as r3138.
2009-07-14 21:57:38 +00:00
0ea2c53c1a
Replaced most wx-based charset conversions with a custom iconv-based conversion. Closes #639 , #666 , #837 , #849 and #877 .
...
Originally committed to SVN as r3137.
2009-07-14 21:28:49 +00:00
dac40729e0
s/greg_/Grigori Goronzy/ for the libass credit updates #894 .
...
Originally committed to SVN as r3135.
2009-07-14 19:45:43 +00:00
49a116804d
Change version in version.cpp and configure.in to 2.2.0, the string freeze is officially over and all the commits we've been holding back can now go in!
...
Originally committed to SVN as r3134.
2009-07-14 18:15:11 +00:00
26c9dd2ce6
More cleanup of local config:
...
* Remove option from Options dialogue, it's an install-time thing really
* Don't try to do file associations at startup if we're portable
* General clean up of config handling code; properly make ?user point to ?data and then everything magically follows, makes a lot of handling cleaner
Originally committed to SVN as r3131.
2009-07-14 04:51:35 +00:00
f1c7ed639d
Properly fix "local config" option, previously it only made config.dat local and kept everything else in %APPDATA% still. Now fixed, along with a load of other problematic uses of relative paths. Still a lot more to go.
...
This also makes a bit of sense of the default options for various paths that previously were implicitly relative to ?user or ?data but never explicitly specified in options.
Originally committed to SVN as r3130.
2009-07-14 03:02:17 +00:00
2f65a5bb68
Remove the dangerous CopyFile function that on Unix attempted to create hard links of files instead of copying them. Replace it with wxCopyFile instead. Patch by jfs. Fixes #912 .
...
Originally committed to SVN as r3129.
2009-07-14 02:20:40 +00:00
68481215c9
Apply patch to fix #910 .
...
Originally committed to SVN as r3128.
2009-07-14 02:00:56 +00:00
543fd177d5
More minor fixes to Windows installer... we're installing VSFilter 2.39e from guliverkli2 and not one from MPC-HC, and list a couple more files for the pre-install cleanup jobs.
...
Originally committed to SVN as r3127.
2009-07-14 00:15:42 +00:00
0816491057
Add src/core/*.h not core/*.h to SOURCES for distfiles.
...
Originally committed to SVN as r3126.
2009-07-13 23:26:03 +00:00
b73d64959e
Even more changes to Windows installer:
...
* Include ffms2.pdb
* Have some files/actions depend on multiple components
Originally committed to SVN as r3125.
2009-07-13 23:09:30 +00:00
7eb58e57e2
Fix include path for MSVC project to point to the new location of ffms2 sources.
...
Originally committed to SVN as r3124.
2009-07-13 22:43:46 +00:00
c2d4884148
Update libass to 94d4104 from http://greg.geekmind.org/viewgit/ .
...
Originally committed to SVN as r3123.
2009-07-13 22:43:25 +00:00
75bfada57e
Actually fix libosxutil includes, as many times as I'd like to belive using 'diff' to transfer from a working copy to a non-working copy is the safest I always endup convincing myself that it's impossible to screw-up a _two_ line patch.
...
Originally committed to SVN as r3121.
2009-07-13 22:38:43 +00:00
882ea814ab
Remove a deprecated compiler flag causing warnings during universalcharset build on Windows.
...
Originally committed to SVN as r3120.
2009-07-13 22:37:19 +00:00
11bda97f9d
I can't belive these snuck in, I specifically ensured they wern't there but obviously I didn't do nearly a good enough job!
...
Originally committed to SVN as r3119.
2009-07-13 22:35:26 +00:00
4599eec308
Wrap libosxutils headers with "extern C"
...
Originally committed to SVN as r3118.
2009-07-13 22:32:11 +00:00
5ad6e777d3
Build changes for the new ffms, TheFluff will be comitting the aegisub changes shortly.
...
Originally committed to SVN as r3117.
2009-07-13 22:30:49 +00:00
a45282bfbb
Update the FFMS2 audio and video providers to use the new API features.
...
Originally committed to SVN as r3116.
2009-07-13 22:30:48 +00:00
5dc912bf4d
Update to the latest ffms (r116) from http://code.google.com/p/ffmpegsource/ .
...
Originally committed to SVN as r3115.
2009-07-13 22:27:40 +00:00
24be06341a
Rename FFmpegsource2/ to libffms/ before the update to r115 from the ffms repo. This doens't make any build changes so things will be broken in this commit.
...
Originally committed to SVN as r3114.
2009-07-13 22:19:44 +00:00
234ee0d3dc
More little changes to Windows installer:
...
* Don't include dictionaries and thesaurii if they don't exist on the machine building the installer
* Sprinkle some more 'solidbreak' flags around, hoping to make compact/custom installations spend less time decompressing huge files that won't be installed
Originally committed to SVN as r3113.
2009-07-13 21:48:53 +00:00
d665909687
Add Russian dictionary and thesaurus files to Windows installer.
...
Originally committed to SVN as r3112.
2009-07-13 21:38:58 +00:00
9c4407729b
Some changes to file ordering, and cosmetic changes, in Windows installer script.
...
Originally committed to SVN as r3111.
2009-07-13 21:26:28 +00:00
ac64269ade
Preparing for 2.1.7 release, new URLs for latest.txt.
...
Originally committed to SVN as r3110.
2009-07-13 18:31:43 +00:00
d37e0f69fb
Missed two renamings in the last commit.
...
Originally committed to SVN as r3109.
2009-07-13 02:48:07 +00:00
1f55f362fb
Hack in some compatibility #defines in FFMS2's utils.h so it'll compile with both older and newer ffmpeg versions. Reverts r3012. Part of this change based on a patch by CharlieB. Fixes #909 .
...
Originally committed to SVN as r3108.
2009-07-13 02:34:41 +00:00
24da41faaf
* BUILD_DARWIN was a define used for libass only, change it to __APPLE__ (sigh)
...
* char config_path -> const char *config_path for non-MAC builds. not sure how the first version got in.
Originally committed to SVN as r3107.
2009-07-12 20:10:25 +00:00
fa3f5d11ef
Made selecting a line via the visual typesetting drag mode also update the grid's selection, fixing one way of getting the edit box out of sync with the other non-time controls.
...
Originally committed to SVN as r3106.
2009-07-12 05:30:01 +00:00
43adde723c
Fix OSX: Move our local libass patch into aegisub itself as libass now supports specifying a fontconfig config file.
...
Originally committed to SVN as r3105.
2009-07-11 17:28:27 +00:00
e250deb10f
Nuke the Windows (MSVC) support as libass will be adding their own official support, it's not like we're using it anyway..
...
Originally committed to SVN as r3104.
2009-07-11 15:55:52 +00:00
76c2d1bd41
Remove mputils.(c|h) as they're no longer needed.
...
Originally committed to SVN as r3103.
2009-07-11 15:54:38 +00:00
df2b0b5b67
Update libass to 15df37.
...
Originally committed to SVN as r3102.
2009-07-11 15:48:50 +00:00
06259dfb1e
Disable Fortran checks, thanks Greg! For whatever reason I only looked at the autoconf source, sigh.
...
Originally committed to SVN as r3101.
2009-07-11 03:45:03 +00:00
bf2b456f0c
Re-fix the fix in r3091; the issue wasn't what I thought it was, it was that memory was being freed twice. Fixes #906 .
...
Originally committed to SVN as r3100.
2009-07-08 13:30:24 +00:00
6779781284
Fixed a memory leak that occurred when resetting hotkey defaults
...
Originally committed to SVN as r3099.
2009-07-06 05:01:55 +00:00
fa54e72105
Even when we don't have any audio players audio_player.cpp is still required in order to register the fact that there are no audio players.
...
Originally committed to SVN as r3098.
2009-07-04 15:53:52 +00:00
349dd2cfe4
Made the edit box only retain its internal undo history for changes made since the last commit or line switch rather than every state it has had since the program was started, fixing a gradual memory leak.
...
Originally committed to SVN as r3097.
2009-07-04 01:46:06 +00:00
1cb43ba5c7
Increased the default size of the time edit control on wxGTK since it was still too small on some OS's after r3094
...
Originally committed to SVN as r3096.
2009-07-03 23:40:26 +00:00
7ecbbf2e5c
Fixed an issue with the Set Start/End to Video and Snap to Scene hotkeys and toolbar buttons where any uncommited changes in the editbox would be reverted. They now behave the same as setting the time via the text boxes.
...
Originally committed to SVN as r3095.
2009-07-03 18:35:46 +00:00
4d0f48f303
Fixed the "Overwrite-Insertion in time boxes" option on Linux and enabled it as the default mode for the time edit boxes on all OS's instead of just Windows
...
Originally committed to SVN as r3094.
2009-07-02 17:29:20 +00:00
bd4644d1bd
Fixed an issue with the spectrum slider not updating the color spectrum in the color picker dialog on Linux
...
Originally committed to SVN as r3093.
2009-07-02 03:33:28 +00:00
58a7b112e1
Fixed removal of the color dropper tool on non-Windows platforms (it was still appearing, though misaligned in the color picker). updates #861
...
Originally committed to SVN as r3092.
2009-07-01 03:16:47 +00:00
Amar Takhar