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
fa73db1bf1
Update ffms2.lib
...
Originally committed to SVN as r2995.
2009-06-01 13:55:06 +00:00
6542dd416d
FFMS2: Improve LAVF audio seeking in weird files
...
Originally committed to SVN as r2994.
2009-05-29 16:35:10 +00:00
eaecf59d91
FFMS2: beta 9 TAG!
...
Originally committed to SVN as r2993.
2009-05-28 20:26:18 +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
841150b2b7
FFMS2:
...
Renamed a public api function just because I can
Less access violations (AGAIN!)
Dumping now implies indexing too
Much better logic for automatically indexing files when FFAudioSource is used in avisynth
Changed defaults for FFIndex
Now FFmpeg's internal codec lists are used for lookup from the non-lavf based parts
Originally committed to SVN as r2991.
2009-05-28 19:33:14 +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
200b3393f9
Another missing ifdef in ffmsindex
...
Originally committed to SVN as r2988.
2009-05-25 16:28:28 +00:00
9cb8cb25cf
FFMS2: unix ifdefs in ffmsindex
...
Originally committed to SVN as r2987.
2009-05-25 16:25:43 +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
50069248e9
Update FFMSIndex to work with the new audio dump method.
...
Also update ffms2.lib (again).
Originally committed to SVN as r2985.
2009-05-25 15:50:31 +00:00
9fe7b04830
FFMS2: revert the initialization mess, instead require the caller to initialize com where it's needed
...
Originally committed to SVN as r2984.
2009-05-25 14:05:04 +00:00
ab5bc99e94
Update ffms2.lib
...
Originally committed to SVN as r2983.
2009-05-25 13:44:27 +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
c8768d8043
FFMS2: more initialization fun
...
Originally committed to SVN as r2981.
2009-05-24 23:04:11 +00:00
cf03d252ca
Update ffms2.lib as per usual
...
Originally committed to SVN as r2980.
2009-05-23 23:03:57 +00:00
f1fbef752c
FFMS2: The usual small fixes
...
Originally committed to SVN as r2979.
2009-05-23 20:04:38 +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
e772ad5e10
FFMS2: Use the average fps for files opened with Haali's splitters
...
Originally committed to SVN as r2977.
2009-05-22 23:41:37 +00:00
159552f36e
FFMS2:
...
Fix the weird crash bug
Fix *nix compilation
Originally committed to SVN as r2976.
2009-05-22 23:28:08 +00:00
870f46f85e
FFMS2: Missing #ifdef
...
Originally committed to SVN as r2975.
2009-05-22 22:12:31 +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
4775179491
Update ffms2.lib to get in sync with last commit.
...
Originally committed to SVN as r2973.
2009-05-22 21:30:57 +00:00
4165b7c963
FFMS2:
...
Added audio decoding using Haali's splitters
Restructuring
Big API changes
Many bug fixes
Originally committed to SVN as r2972.
2009-05-22 21:28: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
dd1c706d5c
FFMS2: More ICL warning inspired fixes
...
Originally committed to SVN as r2960.
2009-05-21 10:39:14 +00:00
ccf24ae3af
FFMS2: ICL compilation fix
...
Originally committed to SVN as r2959.
2009-05-21 10:05:53 +00:00
cb698b5c3f
FFMS2: Another small typo after all the changes
...
Originally committed to SVN as r2957.
2009-05-20 22:40:55 +00:00
67e9033899
FFMS2: Missing #ifdef
...
Originally committed to SVN as r2956.
2009-05-20 19:05:42 +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
cd8d965324
FFMS2:
...
Some more API cleanup
General cleanup
Originally committed to SVN as r2947.
2009-05-17 22:02:43 +00:00
8195d36ee5
Update Japanese translation.
...
Originally committed to SVN as r2946.
2009-05-17 15:17:52 +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
7fcfaa5dc6
Updated ffms2.lib.
...
Originally committed to SVN as r2943.
2009-05-16 12:46:50 +00:00
a312985f36
Split video backend and UI into separate groups in MSVC project file.
...
Originally committed to SVN as r2942.
2009-05-16 12:46:22 +00:00
0b583dcd0d
As required by r2940 supply -DFFMS_EXPORTS when building the library.
...
Originally committed to SVN as r2941.
2009-05-16 12:13:27 +00:00
ab8f6e6239
FFMS2:
...
Rename lots of things, THIS BREAKS THE AEGISUB BUILD because of changed exported type and function names.
Fixed an uninitialized memory bug that would make it crash on unindexed audio tracks in mastroska.
Made ffms.h C-friendlier.
Exports the start time of an audio track in the audio properties.
Less signedness and type conversion warnings.
Originally committed to SVN as r2940.
2009-05-15 23:11:18 +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
863d89ba4f
aegisub_endian.h was missing from MSVC project.
...
Originally committed to SVN as r2932.
2009-05-14 23:58:24 +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
523421300d
Split audio sources in MSVC project into Backend and UI groups.
...
Originally committed to SVN as r2925.
2009-05-14 21:25:08 +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
2acf887157
Fix #845 by counting how many output lines were produced by applying a template to a line, instead of assuming that a template always gets applied, even if it's a code template.
...
Originally committed to SVN as r2922.
2009-05-14 15:34:37 +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
7215f354b9
Update ffms2.lib as per Myrsloik's last commit.
...
Originally committed to SVN as r2919.
2009-05-12 21:31:44 +00:00
68123167fe
FFMS2: api change so the logging level can be set arbitrarily, it also defaults to quiet now
...
Originally committed to SVN as r2918.
2009-05-12 20:50:40 +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
425ca55698
Bump kara-templater version number.
...
Originally committed to SVN as r2914.
2009-05-12 16:39:53 +00:00
d71fa2d85c
Add support for variable loops in kara-templater, and add a few more utility functions.
...
- Variable loops are controlled using the tenv.maxloop(newmax) function to set the loop counter max. This is a wrapper around setting tenv.maxj.
- Add tenv.relayer(newlayer) function for changing the Layer of an output line.
- Add tenv.restyle(newstyle) function for changing the Style of an output line, despite this usually breaking positioning/sizing information.
- tenv.maxloops is an alias for tenv.maxloop.
- tenv.loopctl(newj, newmaxj) controls both loop variables if anyone wants to do that.
This closes #753 but documentation still needs to be written.
Originally committed to SVN as r2913.
2009-05-12 16:36:51 +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
28d4ed7c8a
Extend Auto 4 Lua config dialogues test case to cover most interesting cases of controls.
...
Updates #775 and #776 since they need those cases.
Originally committed to SVN as r2911.
2009-05-12 15:24:07 +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
2c354ba64e
FFMS2: beta 8
...
Originally committed to SVN as r2907.
2009-05-09 21:59:24 +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
7b6a8811be
change how ffmsindex is linked to ffms2 (use a #pragma instead of an extra dependency in the project file)
...
Originally committed to SVN as r2902.
2009-05-05 21:43:49 +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
97427e7b46
Sigh, make gawk happy, I despise gawk someone please get rid of it forever.
...
Originally committed to SVN as r2900.
2009-05-04 08:06:26 +00:00
763231423b
Add a note why the 'sed' hack is nessicary.
...
Originally committed to SVN as r2899.
2009-05-04 06:52:45 +00:00
952935cbea
Add a crappy sed hack to silence gcc warnings, sigh, I wish ImageMagick would update convert already.
...
Originally committed to SVN as r2898.
2009-05-04 06:51:02 +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
c2267bedcc
Plug a bunch of memory leaks from uau in the mplayer2 repo: http://repo.or.cz/w/mplayer.git?a=commit;h=312d9e4b104741b834aa5d71b02228d0cd988a4e
...
libass: Fix cache lookup problem causing memory bloat
The cache code did hash lookups by storing key values in struct fields
and then hashing and comparing the struct as a single memory block. In
at least one case such a struct contained uninitialized padding bytes
which prevented the complete memory area of the struct from matching
even though the fields did. As a result the code failed to find
existing objects in the cache and stored new versions of them, causing
gigabytes of memory use in some circumstances. Initializing the struct
memory to zero before writing the fields avoided such memory use in
tests but is not guaranteed to work if I interpret the C standard
correctly (the compiler is allowed to write garbage over padding bytes
when changing struct member values).
Change the code to use struct-specific hashing and comparison
functions that work field by field to guarantee correct behavior.
Create these by replacing the struct definition with a template that
lists the fields and can be used the generate each of struct
definition, hash function and compare function with some preprocessor
magic (otherwise every field would need to be listed separately in all
three).
Originally committed to SVN as r2895.
2009-05-04 06:48:21 +00:00
b55460ede5
FFMS2:
...
Fix an old bug that would drop the first or second video frame
Greatly improved audio decoding by adding a small internal cache
Originally committed to SVN as r2894.
2009-05-03 19:25:54 +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
94cf1e4c22
FFMS2: Add a missing function the updated matroska parser expects
...
Originally committed to SVN as r2890.
2009-05-01 16:58:15 +00:00
35cea05304
Add an sh script to generate snap tarballs upon successful builds of UNIX platforms (excluding Darwin).
...
Originally committed to SVN as r2889.
2009-05-01 03:58:23 +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
68b382994b
Update libass from MPlayer r29129: Don't automatically wrap lines when WrapStyle==2.
...
Originally committed to SVN as r2886.
2009-04-29 21:06:54 +00:00
91735eb86d
FFMS2: Update Haali's matroska parser
...
Originally committed to SVN as r2885.
2009-04-29 21:06:07 +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
92202a99bf
Some more delayload vsprops files.
...
Originally committed to SVN as r2882.
2009-04-29 19:08:40 +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
338188b184
FFMS2: Beta 7 release
...
Fix 3 gcc warnings
Originally committed to SVN as r2879.
2009-04-29 16:39:15 +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
6eb56f60cd
s/32/??/ to include 64bit builds (what was I thinking?).. it's better than using '*' which could lead to a disaster.
...
Originally committed to SVN as r2877.
2009-04-29 08:07:22 +00:00
56fee329a2
Use 'SetFile' instead of '/usr/bin/SetFile' when creating the .dmg, 10.5 puts it in /usr/bin, on 10.4 it's in /Developer/Tools/.
...
Originally committed to SVN as r2876.
2009-04-29 07:55:40 +00:00
e1effd407d
* Favour '/usr/bin/perl' over 'perl' to ensure the base perl is always used. (it's required)
...
Originally committed to SVN as r2875.
2009-04-29 06:50:08 +00:00
667f950176
* Re-format the arch detection case.
...
* Fix an annoying buy, I hate the loops configure gets stuck in when you do "$blah" = "$blah" vs test "$blah..
Originally committed to SVN as r2874.
2009-04-29 00:49:38 +00:00
5b3a60c506
* Add support in configure.in to detect the arch.
...
* Add two new targets, osx-tinderbox-(bundle|dmg) to handle tinderbox building.
Originally committed to SVN as r2873.
2009-04-28 23:25:42 +00:00
023f61bdbd
Change the buildslave dist name to dist.7z so the waterfall isn't cluttered. There's a link to the archive so it won't be an issue.
...
Originally committed to SVN as r2872.
2009-04-28 17:59:03 +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
606abde1a3
Add a batch file to generate a distfile that can be uploaded.
...
Originally committed to SVN as r2870.
2009-04-28 07:04:53 +00:00
f18ed0748b
Remove an extra line (more testing.)
...
Originally committed to SVN as r2869.
2009-04-28 05:25:37 +00:00
ec87d3c63a
Remove some EOF whitespace (more testing.)
...
Originally committed to SVN as r2868.
2009-04-28 05:24:28 +00:00
5eaa033697
Remove some EOF whitespace.
...
Originally committed to SVN as r2867.
2009-04-28 05:21:23 +00:00
d226cdf33c
Add some error-checking and exit 1's.
...
Originally committed to SVN as r2866.
2009-04-28 05:17:33 +00:00
5de0558228
Add exit codes to various commands to ensure the script fails and doesn't proceed to the next step(s).
...
Originally committed to SVN as r2865.
2009-04-28 05:11:32 +00:00
c12d2d7636
Testing the tinderbox (a stub commit but still useful.)
...
Originally committed to SVN as r2864.
2009-04-28 05:08:18 +00:00
3648f61083
Testing the tinderbox.
...
Originally committed to SVN as r2863.
2009-04-27 20:58:42 +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
4efd1b5567
Update ffms2.lib
...
Originally committed to SVN as r2855.
2009-04-25 23:04:06 +00:00
72c5828bc0
Sigh, add @set before the recently added environment variables (r2847)
...
Originally committed to SVN as r2854.
2009-04-25 23:00:29 +00:00
140dc44882
FFMS2: Another much needed set of fixes to the Haali part
...
Originally committed to SVN as r2853.
2009-04-25 22:09:49 +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
8f7930e876
FFMS2: Even less enum forward declarations
...
Originally committed to SVN as r2850.
2009-04-25 09:09:14 +00:00
6f6d1bdf3a
FFMS2: Less enum forward declaration?
...
Originally committed to SVN as r2849.
2009-04-25 08:55:14 +00:00
f8652576c8
Add CommonProgramFiles CommonProgramFiles(x86) ProgramFiles ProgramFiles(x86) to the build environment.
...
Originally committed to SVN as r2847.
2009-04-25 02:04:33 +00:00
57024a2e7c
vc++ needs TMP/TEMP to be set in the env in order to work correctly.
...
Originally committed to SVN as r2846.
2009-04-24 23:23:48 +00:00
6fae2955fd
FFMS2:
...
Remove the dependency of pixfmt.h in ffms.h
Added the alternative FFMS_GetPixFmt() for getting the different pixel format values
Originally committed to SVN as r2845.
2009-04-24 19:56:19 +00:00
aaad6b4ad6
Update ffms2.lib again
...
Originally committed to SVN as r2844.
2009-04-24 18:41:34 +00:00
83586d2b18
FFMS2:
...
Several bugfixes which should fix crashes in recent versions
Added a simple regression test application
Removed a few useless functions from the API
Add TheFluff's FFmpegSource 1.21 syntax compatibility script
Originally committed to SVN as r2843.
2009-04-24 17:42:21 +00:00
45d6e37ee8
Whoops, remove trunk\ from the solution path.
...
Originally committed to SVN as r2842.
2009-04-24 04:16:01 +00:00
c2e02322cf
Add a bath file to compile aegisub, these will exist _per_ buildslave. It's probably better to keep it here anyway as build environments will not be changable without a historical record being kept. (it's also easier!)
...
Originally committed to SVN as r2841.
2009-04-24 04:00:04 +00:00
fb36f6d4af
Add a solution and windows config for Windows tinderbox building. Submitted by jfs, thanks!
...
Originally committed to SVN as r2840.
2009-04-23 20:26:07 +00:00
4c68bb5412
Updated German translation (by Sebastian Billau).
...
Originally committed to SVN as r2839.
2009-04-23 10:32:00 +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
e42ae2d19d
FFMS2: Various fixes to haali stuff
...
Originally committed to SVN as r2837.
2009-04-22 18:38:28 +00:00
ff7ee2e776
Add a cross-compile condition to AC_RUN_IFELSE in AC_AGI_COMPILE to make cross-compiling work.
...
Originally committed to SVN as r2836.
2009-04-21 22:32:07 +00:00
e2d0317df3
Bunk commit to trigger the build cluster.
...
Originally committed to SVN as r2835.
2009-04-21 18:48:59 +00:00
af68c58f56
Add a command to autogen --skip-configure to allow the autogen/configure steps
...
to be split for the build tinderbox.
Originally committed to SVN as r2834.
2009-04-20 02:45:35 +00:00
544c325dde
Fix typo.
...
Originally committed to SVN as r2833.
2009-04-20 02:43:32 +00:00
2ba96af5b2
Remove outdated and unused Windows installer scripts.
...
Originally committed to SVN as r2832.
2009-04-19 20:48:08 +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
f5bc001e90
Move more project settings into property sheet files.
...
Originally committed to SVN as r2829.
2009-04-18 13:40:52 +00:00
a749c23e8b
Rename auto3 DLL to something less ugly.
...
Originally committed to SVN as r2828.
2009-04-18 13:31:08 +00:00
f6016573c8
revert revision 2825 since apparently it broke all of jfs' changes
...
Originally committed to SVN as r2827.
2009-04-18 13:02:13 +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
caa26103f5
add portaudio_x86.dll to the list of delay-loaded dll's in the vs2008 project file
...
Originally committed to SVN as r2825.
2009-04-18 09:37:54 +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
cc26be476e
add portaudio2 player to the vs2005 project as well while I'm at it
...
Originally committed to SVN as r2814.
2009-04-17 19:45:33 +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
0d6454087e
update ffms2.lib
...
Originally committed to SVN as r2811.
2009-04-17 19:38:12 +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
d77c119d63
Fix a bug in FFMS2 that caused it to write timecodes with scientific notation.
...
Originally committed to SVN as r2808.
2009-04-17 03:25:10 +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
dc34db7f62
Early morning code-o, setting AM_CONDITIONAL _after_ the Makefiles are
...
generated isn't going to work very well.
Originally committed to SVN as r2793.
2009-04-12 10:48:20 +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
Niels Martin Hansen