mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
2854 commits 10 branches 31 tags 48 MiB
Commit graph

1469 commits

Author SHA1 Message Date
harukalover
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
Niels Martin Hansen
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
harukalover
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
Karl Blomster
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
Karl Blomster
7215f354b9 Update ffms2.lib as per Myrsloik's last commit. 
Originally committed to SVN as r2919.
 2009-05-12 21:31:44 +00:00
Fredrik Mellbin
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
Niels Martin Hansen
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
Niels Martin Hansen
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
Niels Martin Hansen
0b4ecb9797 Normalise case for style section names. 
fixes #690 (hopefully)

Originally committed to SVN as r2915.
 2009-05-12 18:10:13 +00:00
Niels Martin Hansen
425ca55698 Bump kara-templater version number. 
Originally committed to SVN as r2914.
 2009-05-12 16:39:53 +00:00
Niels Martin Hansen
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
Niels Martin Hansen
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
Niels Martin Hansen
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
Niels Martin Hansen
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
Karl Blomster
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
Karl Blomster
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
Fredrik Mellbin
2c354ba64e FFMS2: beta 8 
Originally committed to SVN as r2907.
 2009-05-09 21:59:24 +00:00
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Niels Martin Hansen
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
Amar Takhar
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
Amar Takhar
763231423b Add a note why the 'sed' hack is nessicary. 
Originally committed to SVN as r2899.
 2009-05-04 06:52:45 +00:00
Amar Takhar
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
Amar Takhar
b88254856b s/static/const/ to silence gcc warnings. 
Originally committed to SVN as r2897.
 2009-05-04 06:50:37 +00:00
Amar Takhar
de2ec45cea Silence a bunch of gcc 'newline' warnings. 
Originally committed to SVN as r2896.
 2009-05-04 06:50:12 +00:00
Amar Takhar
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
Fredrik Mellbin
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
Karl Blomster
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
Karl Blomster
0a4190ca98 Fix compilation breakage introduced in r2891. 
Originally committed to SVN as r2892.
 2009-05-02 20:06:06 +00:00
Karl Blomster
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
Fredrik Mellbin
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
Amar Takhar
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
Niels Martin Hansen
7e38ebfd82 Ensure some fields in VideoContext get initialised. 
Originally committed to SVN as r2888.
 2009-04-30 22:13:10 +00:00
Karl Blomster
341fc0c019 Re-update the license on Haali's matroska parser. 
Originally committed to SVN as r2887.
 2009-04-29 21:19:45 +00:00
Amar Takhar
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
Fredrik Mellbin
91735eb86d FFMS2: Update Haali's matroska parser 
Originally committed to SVN as r2885.
 2009-04-29 21:06:07 +00:00
Karl Blomster
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
Niels Martin Hansen
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
Niels Martin Hansen
92202a99bf Some more delayload vsprops files. 
Originally committed to SVN as r2882.
 2009-04-29 19:08:40 +00:00
Karl Blomster
aacf2e4c19 remove duplicate variable 
Originally committed to SVN as r2881.
 2009-04-29 17:42:48 +00:00
Karl Blomster
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
Fredrik Mellbin
338188b184 FFMS2: Beta 7 release 
Fix 3 gcc warnings

Originally committed to SVN as r2879.
 2009-04-29 16:39:15 +00:00
Karl Blomster
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
Amar Takhar
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
Amar Takhar
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
Amar Takhar
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
Amar Takhar
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
Amar Takhar
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
Amar Takhar
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
Karl Blomster
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
Amar Takhar
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
Amar Takhar
f18ed0748b Remove an extra line (more testing.) 
Originally committed to SVN as r2869.
 2009-04-28 05:25:37 +00:00
Amar Takhar
ec87d3c63a Remove some EOF whitespace (more testing.) 
Originally committed to SVN as r2868.
 2009-04-28 05:24:28 +00:00
Amar Takhar
5eaa033697 Remove some EOF whitespace. 
Originally committed to SVN as r2867.
 2009-04-28 05:21:23 +00:00
Amar Takhar
d226cdf33c Add some error-checking and exit 1's. 
Originally committed to SVN as r2866.
 2009-04-28 05:17:33 +00:00
Amar Takhar
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
Amar Takhar
c12d2d7636 Testing the tinderbox (a stub commit but still useful.) 
Originally committed to SVN as r2864.
 2009-04-28 05:08:18 +00:00
Amar Takhar
3648f61083 Testing the tinderbox. 
Originally committed to SVN as r2863.
 2009-04-27 20:58:42 +00:00
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
4dafa0ff10 Use less magic numbers 
Originally committed to SVN as r2856.
 2009-04-25 23:08:45 +00:00
Karl Blomster
4efd1b5567 Update ffms2.lib 
Originally committed to SVN as r2855.
 2009-04-25 23:04:06 +00:00
Amar Takhar
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
Fredrik Mellbin
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
Fredrik Mellbin
a41e48a159 Fix the video provider after the FFMS2 changes part2 
Originally committed to SVN as r2852.
 2009-04-25 10:31:39 +00:00
Fredrik Mellbin
f64b10978b Fix the video provider after the FFMS2 changes 
Originally committed to SVN as r2851.
 2009-04-25 09:26:03 +00:00
Fredrik Mellbin
8f7930e876 FFMS2: Even less enum forward declarations 
Originally committed to SVN as r2850.
 2009-04-25 09:09:14 +00:00
Fredrik Mellbin
6f6d1bdf3a FFMS2: Less enum forward declaration? 
Originally committed to SVN as r2849.
 2009-04-25 08:55:14 +00:00
Amar Takhar
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
Amar Takhar
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
Fredrik Mellbin
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
Karl Blomster
aaad6b4ad6 Update ffms2.lib again 
Originally committed to SVN as r2844.
 2009-04-24 18:41:34 +00:00
Fredrik Mellbin
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
Amar Takhar
45d6e37ee8 Whoops, remove trunk\ from the solution path. 
Originally committed to SVN as r2842.
 2009-04-24 04:16:01 +00:00
Amar Takhar
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
Amar Takhar
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
Karl Blomster
4c68bb5412 Updated German translation (by Sebastian Billau). 
Originally committed to SVN as r2839.
 2009-04-23 10:32:00 +00:00
Karl Blomster
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
Fredrik Mellbin
e42ae2d19d FFMS2: Various fixes to haali stuff 
Originally committed to SVN as r2837.
 2009-04-22 18:38:28 +00:00
Amar Takhar
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
Amar Takhar
e2d0317df3 Bunk commit to trigger the build cluster. 
Originally committed to SVN as r2835.
 2009-04-21 18:48:59 +00:00
Amar Takhar
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
Amar Takhar
544c325dde Fix typo. 
Originally committed to SVN as r2833.
 2009-04-20 02:43:32 +00:00
Niels Martin Hansen
2ba96af5b2 Remove outdated and unused Windows installer scripts. 
Originally committed to SVN as r2832.
 2009-04-19 20:48:08 +00:00
Niels Martin Hansen
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
Niels Martin Hansen
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
Niels Martin Hansen
f5bc001e90 Move more project settings into property sheet files. 
Originally committed to SVN as r2829.
 2009-04-18 13:40:52 +00:00
Niels Martin Hansen
a749c23e8b Rename auto3 DLL to something less ugly. 
Originally committed to SVN as r2828.
 2009-04-18 13:31:08 +00:00
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Karl Blomster
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
Niels Martin Hansen
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
Niels Martin Hansen
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