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
harukalover
0d1ede1ed1
Fixed a memory leak that would occur when loading audio while using the hard disk cache
...
Originally committed to SVN as r3056.
2009-06-14 04:29:20 +00:00
Niels Martin Hansen
f20d079598
Fix #890 , make the output formatting for Adobe Encore format use a format string for clearness, instead of string building.
...
Originally committed to SVN as r3055.
2009-06-14 02:42:52 +00:00
Amar Takhar
ebcfe43d7e
Add -I../FFmpegSource2 to AM_CXXFLAGS. This is *definatly* not the right way to do it, it's a temp measure until I figure out the best way to handle it.. updates #883 .
...
Originally committed to SVN as r3054.
2009-06-12 17:26:56 +00:00
Niels Martin Hansen
5f7884ab22
Add FINAL_RELEASE and WITH_STARTUPLOG defines (both commented out) in config_windows0.h base.
...
Originally committed to SVN as r3053.
2009-06-12 17:13:22 +00:00
Karl Blomster
956f657c8d
- Moved lib/ffms2.lib to FFmpegSource2/ffms2.lib.
...
- Deleted the lib folder since nothing uses it anymore.
- Modifed the #include of ffms.h in ffmpegsource_common.h to make it easier to use an external ffms2 instead of the one in the repository.
- Updated vs2008 project file to reflect these changes.
- Easily claims build breaker's hat.
Originally committed to SVN as r3052.
2009-06-12 17:10:45 +00:00
Niels Martin Hansen
ac18b4889b
Add super secret WITH_STARTUPLOG define, if enabled it causes insane amounts of message box spam during startup. Currently only implemented on Windows and should be disabled for almost all conceivable purposes.
...
Originally committed to SVN as r3051.
2009-06-12 16:59:53 +00:00
harukalover
769f61eaf3
Fixed a memory leak that would occur after using any help button
...
Originally committed to SVN as r3050.
2009-06-12 00:04:35 +00:00
harukalover
4eeb89710d
Fixed compilation support with wxWidgets 2.9.0 (seems to work correctly besides some minor gui issues)
...
Originally committed to SVN as r3049.
2009-06-11 23:30:33 +00:00
harukalover
41f71ca3be
Update link to bug tracker in Help menu
...
Originally committed to SVN as r3048.
2009-06-11 18:04:48 +00:00
harukalover
5d010113f0
Oops, r3045 caused crashing issues when closing the translation assistant again. Fixed the crash without having to revert the fix for the memory leaks again.
...
Originally committed to SVN as r3047.
2009-06-11 08:13:54 +00:00
harukalover
7ac69a31b3
* Fixed an issue with the translation assistant not remembering the last position it was placed at before closing it
...
* Fixed some memory leaks in the translation assistant
Originally committed to SVN as r3045.
2009-06-11 02:33:21 +00:00
harukalover
9abcbe19b3
Fixed a memory leak in the auto4 ScriptFactory
...
Originally committed to SVN as r3044.
2009-06-11 02:17:42 +00:00
Amar Takhar
1b9f38747b
Supplant the portaudio player with the portaudio2 player. This still doesn't handle some of the issues that happen on linux, that will be fixed in a later commit, updates #876 .
...
Originally committed to SVN as r3043.
2009-06-10 04:45:57 +00:00
Amar Takhar
17f1ccac06
Completely revert r2970 as line 84 causes crashes elsewhere. While the rest may not cause any issues it's better to deal with some leaking memory than hard crashes.
...
Originally committed to SVN as r3042.
2009-06-10 03:49:59 +00:00
harukalover
10b8a6253b
Fixed a memory leak that would occur when using the visual typesetting tools
...
Originally committed to SVN as r3041.
2009-06-10 03:32:18 +00:00
Amar Takhar
eb27337349
Revert line 85 from r2970 as it causes aegisub to crash in very interesting ways. It's most likely not aegisubs fault entirely however removing this does fix the issue.
...
Originally committed to SVN as r3040.
2009-06-10 03:32:15 +00:00
Amar Takhar
5cff8b2d6a
Remove support for old FFMPEG releases, if you require or want this support you are officially on your own, closes #875 .
...
Originally committed to SVN as r3039.
2009-06-10 02:21:20 +00:00
Niels Martin Hansen
837755b349
Fix #872 , make the gridlines colour be the same as the text colour in the kanji timer display.
...
Originally committed to SVN as r3033.
2009-06-08 03:34:09 +00:00
Niels Martin Hansen
4f3569b7d9
Mostly rewrite the kanji timer. Now using a custom control that avoids most of the problems the old implementation using text-boxes had. The new implementation unifies the pre-grouping and post-grouping display into one.
...
The auto-matching algorithm for Japanese was also rewritten, I think the new code works somewhat better. (For the song I used for testing, I can just hit Enter most of the way through, more than I remember being able to with the old.)
There are some slight oddities with the way the display scrolls when the input goes too close to the edge, but while it can feel confusing it should still keep everything you want to see, visible.
Fixes #847 and #708 .
Originally committed to SVN as r3032.
2009-06-08 02:37:09 +00:00
Niels Martin Hansen
bcd7e64bbd
Extend the kana table with a bunch more specialty characters and notations, and comment the existing esoteric katakana entries.
...
Updates #847 .
Originally committed to SVN as r3031.
2009-06-07 23:51:15 +00:00
Niels Martin Hansen
eae8edcd1f
The KanaTable was missing a destructor. Nobody noticed because the old kanji timer code created but never deleted KanaTable objects on the heap... yes that was a memory leak that'll also get plugged by the rewrite of the kanji timer.
...
Updates #847 .
Originally committed to SVN as r3030.
2009-06-07 23:15:02 +00:00
harukalover
1d945b9b3d
Made the styling assistant require a double click to select a style, this fixes issues with mistakenly selecting a style when the user is just trying to focus the assistant
...
Originally committed to SVN as r3029.
2009-06-07 03:43:12 +00:00
Niels Martin Hansen
a1677d3a2c
The AssEntry::Clone() function ought to have been const all the time... make it. (Ugh, I had to make a const_cast in AssStyle::Clone().)
...
Originally committed to SVN as r3028.
2009-06-07 00:22:36 +00:00
Niels Martin Hansen
1e4ec69f7f
The AssKaraoke parser can just as well take a const AssDialogue for parameter.
...
Originally committed to SVN as r3027.
2009-06-07 00:20:30 +00:00
Amar Takhar
92d5324084
Fix #846 , patch from pomyk, thanks!
...
Originally committed to SVN as r3026.
2009-06-06 21:05:31 +00:00
Niels Martin Hansen
6e2240166f
A bit of const correctness for AssDialogue
...
Originally committed to SVN as r3025.
2009-06-06 19:32:17 +00:00
Niels Martin Hansen
51c36f2803
Close #491 (again), force the min-size of the detached video to be (1,1) after creation and layout.
...
Originally committed to SVN as r3024.
2009-06-06 14:36:22 +00:00
Niels Martin Hansen
6e144e6589
Fix #491 : Let the detached video dialogue take a parameter indicating the initial video size.
...
Originally committed to SVN as r3023.
2009-06-06 02:57:42 +00:00
Niels Martin Hansen
d56b5b1bf6
Fix #598 , repaint the audio display upon playback to get rid of any junk on it.
...
Originally committed to SVN as r3022.
2009-06-06 02:32:31 +00:00
Niels Martin Hansen
0f2d39e28f
Fix #787 , make the Paste and Paste Over commands in the Edit menu sensitive to the current format on the clipboard and only enable them if plain text is a supported format. They will also be enabled if the clipboard fails to open, as a safety device.
...
Originally committed to SVN as r3021.
2009-06-06 02:16:20 +00:00
Niels Martin Hansen
c0586f690c
Close #861 , remove colour dropper tool on non-Windows platforms for now.
...
Originally committed to SVN as r3020.
2009-06-06 01:59:33 +00:00
Niels Martin Hansen
4b41b4ca4a
Fix #607 : Have style editor save its position and size during the session, similar to how several other dialogues already do. The stored position is not persistent, it is lost when Aegisub is closed.
...
Originally committed to SVN as r3019.
2009-06-05 02:02:55 +00:00
Niels Martin Hansen
c74a02e57d
Clean up code in Style Editor a bit, remove no longer needed performance measurement code.
...
Originally committed to SVN as r3018.
2009-06-05 01:49:06 +00:00
Niels Martin Hansen
2feefd85fd
Close #839 , the Shift Times function will now only do something if shifting by a non-zero number of milliseconds, or always if shifting by a number of frames (even zero).
...
Originally committed to SVN as r3017.
2009-06-05 00:02:26 +00:00
Niels Martin Hansen
ce015fc820
Add sample endianness info to all audio providers (except one, intentionally; see the stream provider changeset), and make the converting audio provider convert to native endian when required. Updates #725 but needs some testing. Might break compilation in some places, but shouldn't. ("Works for me.")
...
Originally committed to SVN as r3016.
2009-06-04 23:02:29 +00:00
Niels Martin Hansen
88a5335004
Adjust calculation of secondary colour for checkerboard pattern in dummy video provider. New calculation produces better results for dark colours, the old calculation produced very high contrast patterns for dark colours.
...
Originally committed to SVN as r3015.
2009-06-04 02:28:46 +00:00
Niels Martin Hansen
26ac4e65f8
Another shot at fixing wxGLCanvas woes on Mac, updates #850 . This time the code is also considerably simpler!
...
Originally committed to SVN as r3014.
2009-06-04 02:05:11 +00:00
Niels Martin Hansen
d6a8a07845
Experimental stuff trying to fix wxGLContext errors on Mac, updates #850 . Untested, might break build for Mac.
...
Originally committed to SVN as r3013.
2009-06-04 01:35:11 +00:00
Niels Martin Hansen
390fb2d03c
Remove all traces of local configuration support ("portable application") in non-Windows builds. Closes #856 .
...
Originally committed to SVN as r3011.
2009-06-03 23:42:47 +00:00
Niels Martin Hansen
4b986b5a53
Make the visual typesetting toolbar a bit prettier on Vista and probably also Win7, by removing themed background that didn't blend in with the surroundings.
...
Originally committed to SVN as r3010.
2009-06-03 23:18:40 +00:00
Niels Martin Hansen
f4939c082a
Really fix detached video, closes #853 .
...
Originally committed to SVN as r3009.
2009-06-03 23:08:40 +00:00
Niels Martin Hansen
6dc3015962
Work on fixing detached video, still broken but works a little better now. Updates #853 .
...
Originally committed to SVN as r3008.
2009-06-03 23:01:03 +00:00
harukalover
614f2ef559
Fixed a memory leak that occurred when using undo/redo, fixes #330
...
Originally committed to SVN as r3007.
2009-06-03 19:55:39 +00:00