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
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
95e9ccaf79
Add support for ALSA_(LD|C)FLAGS.
...
Originally committed to SVN as r2790.
2009-04-12 10:28:42 +00:00
21460ec589
Add block for WITH_PORTAUDIO2.
...
Originally committed to SVN as r2789.
2009-04-12 10:08:59 +00:00
d71cbda47b
* s/$found_audio/$found_audio_player/ for clarity.
...
* Add AM_CONDITIONAL for FOUND_AUDIO_PLAYER and FOUND_VIDEO_PROVIDER.
Originally committed to SVN as r2788.
2009-04-12 10:08:28 +00:00
579b46f097
Update PortAudio v19 support.
...
Originally committed to SVN as r2787.
2009-04-12 10:04:10 +00:00
b89ec65c43
Move the PortAudio v19 check above the v18 check.
...
Originally committed to SVN as r2786.
2009-04-11 23:40:15 +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
d39d308d0d
FFMS2 GCC compilation fix
...
Originally committed to SVN as r2781.
2009-04-11 19:43:18 +00:00
6878e5884a
FFMS2 beta 6 (the real commit)
...
Requires a recent FFmpeg
Changes the HAALITS define into HAALISOURCE
Originally committed to SVN as r2780.
2009-04-11 18:45:40 +00:00
5f5960ef00
* Fix check for libavutil/pixfmt.h
...
* Add detection for PortAudio2 (v19)
Originally committed to SVN as r2779.
2009-04-11 18:06:23 +00:00
26e427e838
Add a check for libavutil/pixfmt.h as a low-brow check for FFMPEG r18129+, this
...
needs to be fixed to check exact versions of the library. For now this should
work.
Originally committed to SVN as r2778.
2009-04-11 08:13:09 +00:00
d642bb37ab
Fix an error message to be clearer.
...
Originally committed to SVN as r2777.
2009-04-11 07:51:50 +00:00
d0b1ad983e
Update libass to r29169 of MPlayer.
...
Originally committed to SVN as r2776.
2009-04-11 07:42:48 +00:00
e00fae15d6
Add a -v option to ffmsindex.
...
Originally committed to SVN as r2775.
2009-04-07 01:12:12 +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
245c91a271
Updated ffms2.lib
...
Originally committed to SVN as r2773.
2009-04-06 20:19:33 +00:00
1e47a9d3e5
FFMS2 compile fix for ffmpeg revisions >18129. Probably breaks backwards compatibility so it doesn't compile with older revisions anymore, have fun.
...
Originally committed to SVN as r2772.
2009-04-06 20:15:49 +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
0e299f9146
FFmpegSource2 beta 6, see ffms2.html for change details
...
Originally committed to SVN as r2770.
2009-04-06 19:14:55 +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
9bbf4c4281
FFmpegSource2 beta 5.
...
Fixes a bug with timecode writing, adds some additional documentation and resolves the issue with reading ffmsindex's progress reporting from another program.
Originally committed to SVN as r2768.
2009-03-30 22:09:33 +00:00
6106546f74
Fixed windows project.
...
Originally committed to SVN as r2766.
2009-03-14 20:52:01 +00:00
01d522b344
* Add a (small) hack for scripts/osx-bundle.sh to handle libtools weirdness.
...
* Update path to reflect new repo changes.
Originally committed to SVN as r2765.
2009-03-13 04:27:24 +00:00
2cf7d9c80b
Fix auto3 build after repo change.
...
Originally committed to SVN as r2764.
2009-03-13 04:13:11 +00:00
b5ab061f02
Fix libass on OSX after the repo changes.
...
Originally committed to SVN as r2763.
2009-03-13 04:12:45 +00:00
b2bcb09943
Fix vs2008 build (Patch from Haruka)
...
Originally committed to SVN as r2762.
2009-03-12 05:56:02 +00:00
8b21bd2b9f
Sync libass with r28935 from MPlayer.
...
Originally committed to SVN as r2761.
2009-03-12 03:46:44 +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
7740439efd
Remove dummy.txt it was used ages ago for testing the svn repository.
...
Originally committed to SVN as r2759.
2009-03-09 01:15:01 +00:00
689e353c90
Update the build system for the new repository layout.
...
Originally committed to SVN as r2757.
2009-03-09 00:58:38 +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
bf730cf96e
* Rework the debugging flags to set the variables conditionally on either being
...
enabled.
* Fix some cut-and-paste-o's (dunno how I managed these)
* Move AC_SUBST* outside of the conditionally enabled blocks
* Fix typo.
Originally committed to SVN as r2746.
2009-02-22 22:01:14 +00:00
4960863be2
Add --enable-gcov, --enable-efence and --enable-ccmalloc for gcov, Electric
...
Fence and ccmalloc support. gcov support won't work without manual
intervention (for now) but some hooks will be added later to automate it.
Originally committed to SVN as r2745.
2009-02-22 05:38:46 +00:00
761f044526
Return NULL if n < 0 on line 886, for whatever reason on FreeBSD this falls
...
through exception handling and causes and abort().
Originally committed to SVN as r2743.
2009-02-19 23:58:06 +00:00
0eaa08c405
Add audio_provider_dummy.cpp to the build which is required when _DEBUG is used.
...
Originally committed to SVN as r2739.
2009-02-17 08:12:19 +00:00
8ba90af9cd
Add missing files from aegisub/libosxutil/, packages/, and scripts/.
...
All of the missing files were related to OS X.
Originally committed to SVN as r2735.
2009-02-16 00:27:52 +00:00
82f91ce1fc
Oops, had a C++-style line comment in a C source file
...
Originally committed to SVN as r2726.
2009-02-09 18:10:16 +00:00
2bd0ce3055
Updated version of stdint.h for MSVC
...
Originally committed to SVN as r2725.
2009-02-09 18:08:14 +00:00
f85ad3c81f
Fix the jumpto dialog again. Now sets the max possible number of digits to input based on how many digits are in the final frame number. Patch by Harukalover, solves bugtracker issue #804 .
...
Originally committed to SVN as r2723.
2009-02-05 14:48:19 +00:00
f530b4c0da
Modified Harukalover's patch from yesterday so the frame number is sanitized after entry, not during.
...
Originally committed to SVN as r2722.
2009-02-04 23:22:10 +00:00
6a765528e1
Fix a bunch of edge cases in the VFR code. Patch by Plorkyeran, solves bugtracker issue #773 .
...
Originally committed to SVN as r2721.
2009-02-04 23:11:56 +00:00
d9d0eddfde
Minor cosmetic fixes to the goto frame/time dialog box. Patch by Harukalover.
...
Originally committed to SVN as r2720.
2009-02-04 01:45:43 +00:00
9c6780a33e
* Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking.
...
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
otherwise.
Originally committed to SVN as r2718.
2009-01-29 21:32:39 +00:00
594d44f594
avutil is required on unix/dawrin, not just darwin.
...
Originally committed to SVN as r2710.
2009-01-28 23:34:17 +00:00
9a6265afb6
* Switch FFMPEG detection to use pkg-config.
...
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.
Originally committed to SVN as r2705.
2009-01-28 03:19:53 +00:00
fe2ec42a45
Fix a really dumb bug in the caching video provider that caused crashes when seeking in the video.
...
Originally committed to SVN as r2704.
2009-01-24 23:00:35 +00:00
bd78a5c60e
Instead of generating wxicon_xpm.xpm from icon.ico (which is very low-res)
...
supply a 48x48 xpm to be included as the application icon. There's probably a
better way to do this, like figuring out what the typical application icon size
is and supplying different sizes.
Originally committed to SVN as r2702.
2009-01-24 15:58:38 +00:00
4ddc90f027
Simple subtitle formats weren't being split-recombined correctly in some cases after modifications, because AssEntrty::StartMS didn't match AssDialogue::Start, which caused sorting to fail.
...
Make a hacky fix that involves setting StartMS to Start.GetMS() when Clone()ing an AssDialogue.
Originally committed to SVN as r2700.
2009-01-20 20:08:34 +00:00
fb557ddf6e
Fix restarting aegisub on osx, this uses scripts/osx-bundle-restart-helper.c
...
(written by jfs) to restart aegisub when it actually quites using KQUEUE to
monitor the process until it dies then executing /usr/bin/open <bundle_path>
Originally committed to SVN as r2689.
2009-01-12 22:54:58 +00:00
dc83532e02
Fix restarting after lang/options change (RestartAegisub()).
...
(this is unix only)
Originally committed to SVN as r2687.
2009-01-12 21:26:44 +00:00
439a2c547e
* Only list languages if they're actually installed (checking for the existence
...
of the actual .mo file)
* Add ja to the list of possbile translations.
Originally committed to SVN as r2685.
2009-01-12 21:20:53 +00:00
c476b7b883
Add PORTAUDIO_CFLAGS to portaudio static library compile.
...
Originally committed to SVN as r2684.
2009-01-12 00:21:17 +00:00
5e6253831a
Fix a bug (introduced when support for w64 was added) that caused the PCM provider to never get used.
...
Originally committed to SVN as r2682.
2009-01-10 05:41:56 +00:00
1468be9860
Remove a commented line, r2676 had the Darwin paths fix for automation
...
snuck in (svn drives me mad sometimes!)
Originally committed to SVN as r2677.
2009-01-08 08:48:29 +00:00
852ceef55d
On OS X shared librarys end with .dylib not .so, this fixes the (lame) workaround
...
for auto3 linking.
Originally committed to SVN as r2676.
2009-01-08 08:46:10 +00:00
81a168d625
Add a workaround for dependency_libs in auto3/, libtool brings in libraries
...
automatically which causes link errors due to auto4 (lua 5.1).
Originally committed to SVN as r2675.
2009-01-08 08:22:53 +00:00
24d52e10c9
Forgot to append /AEGISUB_VERSION_DATA to GetDataDir.
...
Originally committed to SVN as r2673.
2009-01-07 10:40:33 +00:00
302f12b472
Add extern "C" around libosxutil.h.
...
Originally committed to SVN as r2670.
2009-01-07 07:35:28 +00:00
ab55433c02
Add libres.cpp to EXTRA_DIST for now until I figure out why it's not working
...
as it should.
Originally committed to SVN as r2666.
2009-01-06 14:21:15 +00:00
d5f5e66e33
* Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG
...
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
detection.
Originally committed to SVN as r2664.
2009-01-06 13:59:15 +00:00
90062363f3
Really do the aegisub->aegisub-2.1 binary rename.
...
Originally committed to SVN as r2663.
2009-01-06 13:58:21 +00:00
bbe33f2b91
Set bin_PROGRAMS to aegisub-2.1
...
Originally committed to SVN as r2661.
2009-01-06 12:35:57 +00:00
675c4caa09
Add multiple version support, everything is now suffixed with MAJOR.MINOR, this
...
will allow users on unix to install and operate different versions of aegisub a$
the same time. Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.
Originally committed to SVN as r2659.
2009-01-06 10:44:49 +00:00
2ded1e69db
Remove unused files, add config/*.h
...
Originally committed to SVN as r2651.
2009-01-05 11:51:34 +00:00
0c6abb553e
Remove a cut-and-past-o
...
Originally committed to SVN as r2650.
2009-01-05 11:51:13 +00:00
Niels Martin Hansen