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
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
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
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
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
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
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
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
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
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
df2b0b5b67
Update libass to 15df37.
...
Originally committed to SVN as r3102.
2009-07-11 15:48:50 +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
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
2e86a73205
Fixed a new[]/delete mismatch
...
Originally committed to SVN as r3089.
2009-06-30 05:29:15 +00:00
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
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
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
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
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
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
ce60827866
I can't spell names...
...
Originally committed to SVN as r3076.
2009-06-17 04:10:11 +00:00
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
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
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
531831250a
Update credits in About box, see #894 .
...
Originally committed to SVN as r3069.
2009-06-17 00:49:41 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
41f71ca3be
Update link to bug tracker in Help menu
...
Originally committed to SVN as r3048.
2009-06-11 18:04:48 +00:00
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
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
9abcbe19b3
Fixed a memory leak in the auto4 ScriptFactory
...
Originally committed to SVN as r3044.
2009-06-11 02:17:42 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
92d5324084
Fix #846 , patch from pomyk, thanks!
...
Originally committed to SVN as r3026.
2009-06-06 21:05:31 +00:00
6e2240166f
A bit of const correctness for AssDialogue
...
Originally committed to SVN as r3025.
2009-06-06 19:32:17 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f4939c082a
Really fix detached video, closes #853 .
...
Originally committed to SVN as r3009.
2009-06-03 23:08:40 +00:00
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
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
1d55e6b7b2
Add some sanity checking to SelectRow to prevent an invalid row from being selected when undoing line insertions
...
Originally committed to SVN as r3006.
2009-06-03 19:04:54 +00:00
f13d23509a
Fix #859 , or rather work around it. There's no good way to detect problematic regexes like the example, and the regex engine lies in wx, so we'll have to do with what wx offers. Put a limit of at most 1000 replacements per line processed, that "should be enough for everyone", and avoids infinite looping.
...
(Also 3000 GET!)
Originally committed to SVN as r3000.
2009-06-01 15:44:59 +00:00
386cc9d3cd
Reword error messages introduced in r2998 to make it Aegisub's fault and not the graphics drivers'. Even if our code is technically correct, it's still our problem.
...
Updates #799 .
Originally committed to SVN as r2999.
2009-06-01 15:29:22 +00:00
60970e5f29
Add some error catching in the OpenGL code, this should make most OpenGL-related problems less fatal, though it can still cause funky UI problems I think.
...
At least the user should get a slightly more useful error message now.
Updates #799 .
Originally committed to SVN as r2998.
2009-06-01 15:26:26 +00:00
da78539ab2
Make DSound2 audio player use dynamic latency trickery and only do streaming (looping buffer) playback for long playback durations. This should fix most if not all "could not lock buffer" errors and close #855 .
...
Originally committed to SVN as r2997.
2009-06-01 14:53:18 +00:00
db27d770f6
Fix #599 , the wrong overload for wxSpinCtrl::SetValue was used causing only the edit control part to be updated.
...
Originally committed to SVN as r2996.
2009-06-01 13:57:34 +00:00
ea80b6c130
Changes required to compile because of the previous commit
...
Originally committed to SVN as r2992.
2009-05-28 19:34:52 +00:00
dfdea0298b
Revert r2965 and r2961, although they fixed the memory leaks they also caused a crash when closing either dialog under some operating systems
...
Originally committed to SVN as r2990.
2009-05-27 02:08:21 +00:00
379f15659a
Do COM initialization more properly (I think) in the FFMS2 providers.
...
Originally committed to SVN as r2989.
2009-05-25 16:42:33 +00:00
c8b125943c
Update FFMS2 providers to initialize COM when running under Windows, as per the new FFMS2 init procedure.
...
Originally committed to SVN as r2986.
2009-05-25 15:52:42 +00:00
a1a4d797e7
Turn broken hotkeys.dat file into a non-fatal error. If the file is broken (usually meaning exists but empty) the existing file will now be copied to hotkeys.bak and the defaults restored and saved as hotkeys.dat.
...
Originally committed to SVN as r2982.
2009-05-24 23:19:28 +00:00
3220a2301a
FFMS2:
...
Simplify the avisynth filters
Small api change => you can now list a group of desired colorspace output formats for automatic selection, less functions can return errors
Less singnedness warnings
Originally committed to SVN as r2978.
2009-05-23 14:18:51 +00:00
a3ad037940
Fix ffms2 providers to work with latest FFMS2 API changes.
...
Originally committed to SVN as r2974.
2009-05-22 21:44:02 +00:00
2377b1455e
Increase grabbing zone for karaoke split markers from 4 to 7 pixels, makes dragging much easier, speeding up work.
...
Originally committed to SVN as r2971.
2009-05-22 14:30:51 +00:00
10a11ce0cc
Fixed some of the larger memory leaks in the LibassSubtitlesProvider detected by valgrind
...
Originally committed to SVN as r2970.
2009-05-22 04:09:09 +00:00
17f0e664f0
Initialize a variable in the audio display that sometimes was used without any initial value being assigned to it.
...
Originally committed to SVN as r2969.
2009-05-22 02:27:36 +00:00
ef4021f757
Make error handling in DSound2 audio player more robust. When an error happened in the playback thread, the error_happened flag was set, but was never cleared when the error was detected in the main thread. Furthermore, the main thread didn't act upon the error besides showing it, it kept acting as if the playback thread was still alive and playing, causing the error to be triggered continuously requiring you to kill Aegisub to get out.
...
Made the error_happened event reset itself after being checked so the check only succeeds the first time. (The playback thread returns from its threadproc upon error.) Mark playback thread as dead when error is detected, such that a new thread will be created next time playback is started, effectively making errors non-fatal.
Playback still works as expected, however I haven't tested what actually happens now when an error occurs.
Originally committed to SVN as r2968.
2009-05-22 01:41:31 +00:00
bceabf4848
Fixed some mismatched new[]/deletes in the audio display detected by valgrind
...
Originally committed to SVN as r2967.
2009-05-22 00:05:25 +00:00
fff437ea19
Fixed a memory leak in the CSRISubtitlesProvider
...
Originally committed to SVN as r2966.
2009-05-21 23:02:34 +00:00
b4a5032b2e
Fixed some memory leaks in the kanji timer
...
Originally committed to SVN as r2965.
2009-05-21 22:57:43 +00:00
ecc4b618b3
Fixed a memory leak in the style manager, the storage of catalog styles was never being cleared when closed.
...
Originally committed to SVN as r2964.
2009-05-21 22:24:52 +00:00
acf2f5fa40
Fixed some memory leaks in the style manager detected by valgrind
...
Originally committed to SVN as r2963.
2009-05-21 22:15:32 +00:00
68d2681193
Fixed a memory leak in the dummy video provider detected by valgrind. The video frame was being allocated but never deallocated.
...
Originally committed to SVN as r2962.
2009-05-21 19:49:23 +00:00
350d9e5db7
Fixed some memory leaks in the translation assistant detected by valgrind
...
Originally committed to SVN as r2961.
2009-05-21 18:37:36 +00:00
34c50c8cd9
FFMS2:
...
Split indexing into a 2 step process so track numbers/types become known in advance
Big code cleanup and renaming
Originally committed to SVN as r2955.
2009-05-20 18:57:03 +00:00
083e2ee91c
Initialized a variable that was being used before it was assigned an initial value
...
Originally committed to SVN as r2954.
2009-05-20 18:29:01 +00:00
5bdcf2f63a
Update #742 , attempt fixing the bug. Removing wxEXPAND from some sizers, seems to work fine on Windows. Will test Mac build when tinderbox builds it.
...
Originally committed to SVN as r2953.
2009-05-18 23:37:41 +00:00
6f0c5e6489
* Fixed some more memory leaks reported by valgrind and msvc by reimplementing a couple of singleton pattern based classes
...
* Fixed a memory leak that occurred from never deleting a wxBitmap allocated in OpenGLTextGlyph
Originally committed to SVN as r2952.
2009-05-18 05:51:37 +00:00
392fbdfa4d
Fix a bunch of memory leaks reported by valgrind and msvc about the registered factories never being cleared.
...
Originally committed to SVN as r2951.
2009-05-18 05:42:54 +00:00
9891c28977
Add a corresponding PopEventHandler call for each PushEventHandler call, this fixes a couple of memory leaks reported by valgrind and msvc.
...
Originally committed to SVN as r2950.
2009-05-18 05:33:49 +00:00
f1bfb947cf
Call TestDestroy() to ensure we can delete the FontsCollectorThread, fixes #561
...
Originally committed to SVN as r2949.
2009-05-18 05:24:07 +00:00
5717f81ef2
Update FFMS2 providers to account for FFMS2 API change in last commit.
...
Also update ffms2.lib to corresponding version.
Originally committed to SVN as r2948.
2009-05-17 22:12:46 +00:00
008f7f3853
Prevent an out of range exception from being thrown. (was commonly being thrown when commit was used on the last row of the grid)
...
Originally committed to SVN as r2945.
2009-05-17 05:47:28 +00:00
ef407b6e68
Make FFmpegSource video and audio providers build again after FFMS2 changes last night.
...
Originally committed to SVN as r2944.
2009-05-16 12:47:23 +00:00
f6bd6df490
Hack to fix #687 , if playing to end of audio, changing the selection end shouldn't affect the playback end: it should still play to end of audio.
...
Originally committed to SVN as r2939.
2009-05-15 15:23:34 +00:00
a6c7a8a724
Apply Plorkyeran's patch to close #843 .
...
Originally committed to SVN as r2938.
2009-05-15 12:44:36 +00:00
5bb56ae5d4
Fix gcc breakage caused by last commit, and remove an unused variable while at it.
...
Originally committed to SVN as r2937.
2009-05-15 12:31:09 +00:00
a3cd374bc0
Add a bit of sanity checking to FractionalTime.
...
Originally committed to SVN as r2936.
2009-05-15 12:18:33 +00:00
1520e51dd0
Fixed Replace Next not marking the script as modified.
...
Originally committed to SVN as r2935.
2009-05-15 02:50:43 +00:00
988df0ab81
Fix #809 , properly close all SRT overrides during export and ensure overrides in recombined lines do not affect each other (per the example I gave in the report.)
...
Originally committed to SVN as r2934.
2009-05-15 01:34:00 +00:00
44e17e9e11
Converting audio provider didn't know about channel count during bitdepth and samplerate conversion and intermixed samples from channels and more, resulting in garbage output. Fixes #726 .
...
Originally committed to SVN as r2933.
2009-05-15 00:48:43 +00:00
8ca726119f
Fix #825 for good, I hope. Get some sense worked into the handling of AssEntry::StartMS and AssDialogue::Start using some private members and virtual getter/setter functions.
...
Originally committed to SVN as r2931.
2009-05-14 23:45:20 +00:00
fb6280b2e7
More const correctness in AssTime, broke build because I forgot to add const keyword to implementation too.
...
Originally committed to SVN as r2930.
2009-05-14 23:27:38 +00:00
3977fff411
Const correctness in AssTime.
...
Originally committed to SVN as r2929.
2009-05-14 23:09:04 +00:00
4e417a6dae
Change audio autoscroll behaviour:
...
* In karaoke mode, instead of scrolling start to end of active line into view, scroll start of selection to end of line into view. This gives sensible results when horizontal zoom is great enough that the entire line isn't visible at once and the syllable is too far from the start of the line. This fixes #677 .
* If the line is too long to fit in the display, always left-align it instead of sometimes left-aligning and sometimes centering. (I think the old behaviour depended on the actual scroll position.)
Originally committed to SVN as r2928.
2009-05-14 22:12:05 +00:00
84b068b53a
Undo last change, code *was* used after all. Strangely my compiler didn't complain on first try...
...
Removing the comment about "is this even used?" as well...
Originally committed to SVN as r2927.
2009-05-14 21:44:43 +00:00
cab268c9bb
Remove some unused code from karaoke UI.
...
Originally committed to SVN as r2926.
2009-05-14 21:26:39 +00:00
1cc280216c
* Fixed a mismatched new[]/delete
...
* Fixed a memory leak that would occur when loading subtitles from a matroska file
Originally committed to SVN as r2924.
2009-05-14 18:28:57 +00:00
ce15bc55bc
* Fixed the styling assistant marking the script as modified when it was unfocused and the Enable preview checkbox was unchecked even if no changes actually were made in the styling assistant.
...
* Removed some no longer needed code in the styling assistant.
Originally committed to SVN as r2923.
2009-05-14 17:29:07 +00:00
f4808b82a0
Made the styling assistant modeless so the user can access other controls within aegisub without having to close the styling assistant, fixes #397
...
Originally committed to SVN as r2921.
2009-05-14 07:02:01 +00:00
ffa5a2021d
- Reworked the SMPTE timecode handling with Plorkyeran's help. It does now handle dropframe timecodes as well; the ms->SMPTE handling has been tested and seems reasonably correct, while the reverse conversion remains untested and unused. The Adobe Encore export filter will now use dropframe timecodes properly (previously it would play pretend with wallclock hours/minutes/seconds and incorrect frame numbers).
...
- Changed the SubtitleFormat::AskForFPS dialog box; removed the "PAL/NTSC only" choice and added a "show SMPTE dropframe" parameter instead. Also added 50fps as a choice.
- While I was at it, reworked the TranStation export filter so it actually looks ahead to see if the next line will overlap with the current, and if so, move the end time of the current line backwards one frame, which fixes #767
Originally committed to SVN as r2920.
2009-05-13 20:24:21 +00:00
3ddf48665a
Apparently not all platforms agree on providing MININT and MAXINT constants. Work around it by calculating those values ourselves.
...
Originally committed to SVN as r2917.
2009-05-12 20:48:05 +00:00
55d5b668fa
Integer-edits in Auto 4 Lua config dialogues now always get spin buttons. If no min/max is specified, minint/maxint are assumed.
...
Originally committed to SVN as r2916.
2009-05-12 20:26:19 +00:00
0b4ecb9797
Normalise case for style section names.
...
fixes #690 (hopefully)
Originally committed to SVN as r2915.
2009-05-12 18:10:13 +00:00
277adad41f
Fix a bunch of bugs with config dialogues in Auto 4 Lua:
...
- When default buttons were present, pushing OK caused no button code to be returned at all.
- A load of controls not handling default/initial values properly, closes #775 and #776
Originally committed to SVN as r2912.
2009-05-12 15:32:11 +00:00
05e847b6d2
Make AssColor::Parse() also understand HTML colours with a bit of help from wx.
...
Originally committed to SVN as r2910.
2009-05-12 15:14:35 +00:00
ebcdf0ce46
Move the SMPTE timecode stuff out of the AssTime class and put it in a class of its own, FractionalTime. The AssTime to SMPTE part is tested and verified to work (in fact it looks like I unintentionally fixed an overlap bug in the TranStation export filter), while the SMPTE to AssTime part is completely untested (but it's currently not used anywhere so it's not like it matters).
...
Originally committed to SVN as r2909.
2009-05-10 03:50:58 +00:00
61a3c5657a
Fix a memleak in the FFMS2 video provider (the frame was never unallocated on video close). Patch by Harukalover, fixes #838
...
Originally committed to SVN as r2908.
2009-05-10 00:12:04 +00:00
f869cd0231
Fix a minor bug that caused the add leadin/leadout buttons to not update the time edit boxes. Patch by Harukalover, fixes #836 .
...
Originally committed to SVN as r2906.
2009-05-07 17:52:29 +00:00
732ccbbb26
The buffer length/wanted latency in the dsound2 audio player are now tweakable in config.dat; the options are called "audio dsound buffer latency" and "audio dsound buffer length" respectively. Defaults to 100/5 respectively (should work for the people who used to get buffer errors); for better responsiveness try 80/4.
...
Originally committed to SVN as r2905.
2009-05-07 14:47:36 +00:00
4d83215690
Fix a bug (in a somewhat questionable manner) that would cause the text file writer to occasionally think the system locale was Unicode when it wasn't (by using an uninitialized variable in a condition). Should fix the issue with the SRT export filter failing to write "1" on the first line when using "local" as the text encoding.
...
Originally committed to SVN as r2904.
2009-05-06 19:14:10 +00:00
1e2a031765
Add Aegisub::Script::set_undo_point() to auto4-perl. Currently not all that useful since auto4-perl currently only supports macros and nothing else, and using a macro sets an undo point after execution automatically anyway.
...
Originally committed to SVN as r2903.
2009-05-06 12:25:08 +00:00
24aa9785ae
Oops, had swapped size and value parameters in a memset call.
...
Originally committed to SVN as r2901.
2009-05-04 19:15:57 +00:00
b88254856b
s/static/const/ to silence gcc warnings.
...
Originally committed to SVN as r2897.
2009-05-04 06:50:37 +00:00
de2ec45cea
Silence a bunch of gcc 'newline' warnings.
...
Originally committed to SVN as r2896.
2009-05-04 06:50:12 +00:00
c84a79fb7f
Implemented an automated cache cleaner that keeps the FFMS2 index cache at a manageable size. Cleaning is started when video is opened with the FFMS2 video provider and runs in its own thread. Removal is based on last access time, and the FFMS2 providers now explicitly touch the index files on reading to make sure access time is updated.
...
By default the cache is kept below 42MB and 20 files; to change the defaults change "FFmpegSource max cache size" and "FFmpegSource max cache files" in config.dat. Either or both may be set to 0, but the cleaner will not delete the last index file in the directory, regardless of cache settings and of the file's size.
Originally committed to SVN as r2893.
2009-05-03 18:05:30 +00:00
0a4190ca98
Fix compilation breakage introduced in r2891.
...
Originally committed to SVN as r2892.
2009-05-02 20:06:06 +00:00
04e4249219
Don't let the MKV parser crash on certain MKV's for which it cannot determine the filesize by itself. (Adaption of Myrsloik's similar fix for FFMS2.)
...
Originally committed to SVN as r2891.
2009-05-02 19:40:55 +00:00
7e38ebfd82
Ensure some fields in VideoContext get initialised.
...
Originally committed to SVN as r2888.
2009-04-30 22:13:10 +00:00
341fc0c019
Re-update the license on Haali's matroska parser.
...
Originally committed to SVN as r2887.
2009-04-29 21:19:45 +00:00
33c31e3eee
Update Haali's MatroskaParser.c/.h in the main source tree (there's a copy in the FFMS2 folder as well, which will be updated later). Should fix a crash with x264-generated MKV's.
...
Originally committed to SVN as r2884.
2009-04-29 21:00:08 +00:00
866f9d21fc
Let AudioProvider::GetAudioWithVolume() catch exceptions in AudioProvider::GetAudio() and return blank audio when that happens. Errors are not logged or otherwise handled. This fixes #800 for most cases, even if poorly.
...
Originally committed to SVN as r2883.
2009-04-29 19:30:02 +00:00
aacf2e4c19
remove duplicate variable
...
Originally committed to SVN as r2881.
2009-04-29 17:42:48 +00:00
1b2d26c231
Fix a few memory leaks in the FFMS2 providers. Patch by Myrsloik.
...
Originally committed to SVN as r2880.
2009-04-29 17:40:02 +00:00
7f44500c89
Don't fail to read subtitles from MKV's that are named .mks or .mka, both of those are reported as supported formats in the "open subtitles" dialog box.
...
Originally committed to SVN as r2878.
2009-04-29 14:04:23 +00:00
8c44d698e4
Don't try to synch audio when there is no audio player/provider present. (Could cause a crash under certain rare conditions.) Thanks Avi for report and fix.
...
Originally committed to SVN as r2871.
2009-04-28 10:23:20 +00:00
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
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
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
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
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
4dafa0ff10
Use less magic numbers
...
Originally committed to SVN as r2856.
2009-04-25 23:08:45 +00:00
a41e48a159
Fix the video provider after the FFMS2 changes part2
...
Originally committed to SVN as r2852.
2009-04-25 10:31:39 +00:00
f64b10978b
Fix the video provider after the FFMS2 changes
...
Originally committed to SVN as r2851.
2009-04-25 09:26:03 +00:00
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
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
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
a749c23e8b
Rename auto3 DLL to something less ugly.
...
Originally committed to SVN as r2828.
2009-04-18 13:31:08 +00:00
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
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
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
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
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
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
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
8a5933385d
Make libauto3 better liked by MSVC 2008.
...
Originally committed to SVN as r2816.
2009-04-17 20:51:58 +00:00
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
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
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
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
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
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
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
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
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
7271a74b54
Forgot to put license on VideoSink.h as well.
...
Originally committed to SVN as r2802.
2009-04-16 13:01:05 +00:00
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
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
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
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
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
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
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
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
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
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
21460ec589
Add block for WITH_PORTAUDIO2.
...
Originally committed to SVN as r2789.
2009-04-12 10:08:59 +00:00
97c857a94f
Add 'PortAudio2' as an audio player.
...
Originally committed to SVN as r2785.
2009-04-11 23:23:30 +00:00
3247ad6c6c
Change WITH_PORTAUDIO -> WITH_PORTAUDIO2
...
Originally committed to SVN as r2784.
2009-04-11 23:18:04 +00:00
e61d0b77ac
Update audio_player_portaudio2.* for PortAudio v19.
...
Originally committed to SVN as r2783.
2009-04-11 23:16:58 +00:00
23eea68fdd
Verbatium copy of audio_player_portaudio.* -> audio_player_portaudio2.*
...
Originally committed to SVN as r2782.
2009-04-11 23:15:45 +00:00
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
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
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
6106546f74
Fixed windows project.
...
Originally committed to SVN as r2766.
2009-03-14 20:52:01 +00:00
2cf7d9c80b
Fix auto3 build after repo change.
...
Originally committed to SVN as r2764.
2009-03-13 04:13:11 +00:00
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
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
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
Karl Blomster