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
7532387444
Remove further deprecated compiler flags causing warnings from MSVC projects.
...
Originally committed to SVN as r3122.
2009-07-13 22:42:17 +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
383d0f3149
Fix a potential crash on exiting. (An invalid memory location could under certain circumstances be assigned to in the OpenGLTextTexture destructor.)
...
Originally committed to SVN as r3091.
2009-06-30 20:44:38 +00:00
Karl Blomster