Commit graph

322 commits

Author SHA1 Message Date
Amar Takhar aa86cdb062 Turn a few string joins into wxString::Format, also change a printf to wxLogDebug as it's unnecessary spam to the user, this fixes a weird error wx2.9 was having.
Originally committed to SVN as r3222.
2009-07-23 17:02:19 +00:00
Amar Takhar 0f6977fa39 Fix a cast issue in GetCacheFilename under wx2.9.. fix by jfs, thanks!
Originally committed to SVN as r3221.
2009-07-23 15:37:47 +00:00
Amar Takhar a0370f9004 Remove Aegisub::String class as it's causing problems in wx2.9. The original plan was to have it so external modules wouldn't have to depend on wx. We'll think of a different solution when the time comes. closes #940
Originally committed to SVN as r3220.
2009-07-23 15:16:53 +00:00
Amar Takhar e496c0487d Remove a couple of auto3 remnants from Makefile.am.
Originally committed to SVN as r3219.
2009-07-23 15:14:21 +00:00
Niels Martin Hansen 312aa52096 Make spectrum mode the default for the audio display, closes #943.
Originally committed to SVN as r3218.
2009-07-23 13:57:40 +00:00
Amar Takhar cd7e414b08 It looks like windows needs this change as well.
Originally committed to SVN as r3216.
2009-07-23 07:09:57 +00:00
Amar Takhar d14aa9d8f0 typedef String to wxString until we decide upon the removal of Aegisub::String. (i hope so!), this fixes wx2.8 and wx2.9 when using wc_str().
Originally committed to SVN as r3215.
2009-07-23 06:00:23 +00:00
Amar Takhar c170f7f096 c_str() -> wc_str() in preperation for wx2.9, these changes are required for Unix, should be harmless on Windows.
Originally committed to SVN as r3214.
2009-07-23 05:32:13 +00:00
Amar Takhar b127105f42 Remove extra FFmpegSourceProvider:: qualifier.
Originally committed to SVN as r3212.
2009-07-23 03:16:57 +00:00
Karl Blomster 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
Niels Martin Hansen 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
Karl Blomster 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
Niels Martin Hansen 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
Amar Takhar 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
Amar Takhar 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
Niels Martin Hansen 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
Niels Martin Hansen c52d45dd95 Missed a bunch of things removing Auto3...
Originally committed to SVN as r3200.
2009-07-23 00:49:54 +00:00
Amar Takhar dbf0f48713 Nuke auto3 from the Unix/OSX build system.
Originally committed to SVN as r3199.
2009-07-23 00:27:57 +00:00
Niels Martin Hansen 2fef9e3111 Remove libauto3 that somehow escaped before.
Originally committed to SVN as r3198.
2009-07-23 00:22:57 +00:00
Niels Martin Hansen 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
Karl Blomster 352df194aa Remove the DirectShow VideoProvider. Fixes #930.
Originally committed to SVN as r3195.
2009-07-23 00:12:22 +00:00
Niels Martin Hansen 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
Niels Martin Hansen 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
harukalover 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
Niels Martin Hansen 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 9e150d282d Cosmetics in the y4m video provider
Originally committed to SVN as r3177.
2009-07-19 22:51:19 +00:00
Amar Takhar 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
Amar Takhar 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
Karl Blomster 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
Karl Blomster 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
Thomas Goyne 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
Thomas Goyne 0fa0d9d17e Add some parentheses for clarity.
Originally committed to SVN as r3162.
2009-07-18 03:58:22 +00:00
Thomas Goyne 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
Thomas Goyne 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
Thomas Goyne 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
Amar Takhar 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
Amar Takhar 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
Karl Blomster 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
Amar Takhar 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
Karl Blomster 62b036ac35 Fix accidental inclusion of test code in last commit.
Originally committed to SVN as r3153.
2009-07-16 19:25:43 +00:00
Karl Blomster 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
Amar Takhar 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Karl Blomster 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
Niels Martin Hansen 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
Karl Blomster 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
Thomas Goyne 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
Amar Takhar 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
Amar Takhar 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
Niels Martin Hansen 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
Niels Martin Hansen 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
Karl Blomster 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
Niels Martin Hansen 68481215c9 Apply patch to fix #910.
Originally committed to SVN as r3128.
2009-07-14 02:00:56 +00:00
Amar Takhar 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
Amar Takhar 4599eec308 Wrap libosxutils headers with "extern C"
Originally committed to SVN as r3118.
2009-07-13 22:32:11 +00:00
Amar Takhar 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
Karl Blomster 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
Niels Martin Hansen 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
Amar Takhar 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
Thomas Goyne 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
Amar Takhar 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
Amar Takhar df2b0b5b67 Update libass to 15df37.
Originally committed to SVN as r3102.
2009-07-11 15:48:50 +00:00
Karl Blomster 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
harukalover 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
Amar Takhar 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
Thomas Goyne 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
harukalover 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
Thomas Goyne 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
harukalover 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
harukalover 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
harukalover 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
Karl Blomster 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
harukalover b3a69668bf * Fixed an issue with aegisub not trying to open the local config.dat in Windows builds, fixes #902
* Fixed an issue with aegisub failing to start if a local config.dat existed but aegisub did not have permission to write to it

Originally committed to SVN as r3090.
2009-06-30 05:55:03 +00:00
harukalover 2e86a73205 Fixed a new[]/delete mismatch
Originally committed to SVN as r3089.
2009-06-30 05:29:15 +00:00
Amar Takhar 59e6ca965f Unbreak Unix/OSX from r3085, I'll let jfs do a proper fix when he's around. Updates #884.
Originally committed to SVN as r3087.
2009-06-25 02:31:35 +00:00
Niels Martin Hansen a4573a1c72 For whatever reason, the right-click-to-play-syllable code in karaoke mode was calling the audio player directly, instead of using the usual Play function in the audio display. Fixes #598 for real.
Originally committed to SVN as r3086.
2009-06-25 00:32:33 +00:00
Niels Martin Hansen beedca2fba Fix #884, annoying wxString::Trim is destructive and there's no non-destructive variant. Adding a new function to utils.cpp to test whether a string is "blank", ie. empty or whitespace-only, as well as a function to check if a wchar_t is a whitspace character.
Trimming was used to test whether a string was blank or not, and this caused the source syllable texts to be altered when the kanji interpolation algorithm was run.

Originally committed to SVN as r3085.
2009-06-24 22:22:45 +00:00
Karl Blomster a7760db77b Adjust the way VFR is handled in VideoContext::SetVideo; should be cleaner and less prone to odd bugs now (hopefully). Doesn't try to set CFR framerates on VFR videos anymore, for one thing. Fixes #864.
Originally committed to SVN as r3084.
2009-06-24 18:16:03 +00:00
Karl Blomster 2e9439c9f5 Implement timestamp reading from the container in the ffmpeg video provider. Updates #864.
Originally committed to SVN as r3083.
2009-06-24 17:43:36 +00:00
harukalover ee37d42618 Fixed an issue with Shift to Current Frame not updating the time edit boxes in the subs edit box, resulting in commit using the previous no longer valid times. Fixes #897
Originally committed to SVN as r3081.
2009-06-19 22:18:30 +00:00
Niels Martin Hansen ce60827866 I can't spell names...
Originally committed to SVN as r3076.
2009-06-17 04:10:11 +00:00
Niels Martin Hansen 33d1b6d7d0 Change some nicknames for real names in About box, updates #894.
Originally committed to SVN as r3074.
2009-06-17 02:42:26 +00:00
harukalover d83b19e57b Fixed a memory leak that occurred from canceling loading of audio with cache type set to RAM
Originally committed to SVN as r3073.
2009-06-17 02:04:01 +00:00
Amar Takhar e571fe0500 Remove whats probably a cut and paste-o introduced in r3069.
Originally committed to SVN as r3070.
2009-06-17 01:02:32 +00:00
Niels Martin Hansen 531831250a Update credits in About box, see #894.
Originally committed to SVN as r3069.
2009-06-17 00:49:41 +00:00
Niels Martin Hansen b90baf0ef4 Fix #885, for some reason mouse events were firing in the audio display while some internal variables were invalid. Now mouse events are skipped if the display is missing a player or provider.
Originally committed to SVN as r3068.
2009-06-16 23:44:06 +00:00
Niels Martin Hansen 8e13869510 Got all the Unicode codepoints listed in Plorkyeran's patch and listed them in an array, to avoid encoding the source file as UTF-8 or UTF-16. Updates #710, seems to fix it but someone please confirm.
Originally committed to SVN as r3067.
2009-06-16 23:29:56 +00:00
Niels Martin Hansen e0a3aeca3d Fix #892, LuaScriptReader wasn't checking if opening the file actually succeeded.
Check, and throw an exception if it fails.

Originally committed to SVN as r3065.
2009-06-16 21:21:25 +00:00
Niels Martin Hansen bab71db434 * Change version string formatting to a cleaner format.
* Non-FINAL_RELEASE builds no longer show a version number, only SVN revision.
 * FINAL_RELEASE builds show SVN revision in About box only.
 * Also change FINAL_RELEASE version number to 2.1.7.

Originally committed to SVN as r3064.
2009-06-16 19:11:08 +00:00
Niels Martin Hansen 7097b3be3e New splash screen, following theme from Windows installer splash: Faded out and cropped shield in background, logo superimposed.
Closes #858 unless someone complains loudly.

Originally committed to SVN as r3063.
2009-06-16 19:08:54 +00:00