d4f77b7135
Fix typo in Makefile.am preventing video_out_gl.cpp from getting built
...
Originally committed to SVN as r3750.
2009-10-29 13:28:23 +00:00
b267327b67
Merge r3745.
...
Originally committed to SVN as r3747.
2009-10-28 00:41:23 +00:00
370e02940d
Merge r3743,r3744 Updates #1029 .
...
Originally committed to SVN as r3746.
2009-10-28 00:40:48 +00:00
cb1127af2a
Backport rewritten video display to 2.1.8. Merges revisions 3615,3617,3620,3623,3628-3631,3666,3711,3714,3717,3723,3726,3729,3739 (VideoOutGL); 3190,3201,3526,3613 (exception.h) from trunk.
...
Originally committed to SVN as r3741.
2009-10-27 20:41:11 +00:00
5f5c5569b8
Fix the "Could not lock audio buffer for filling" issue that has been plaguing Windows 7 users, and to some extent also other Windows versions when using the DSound2 audio player.
...
The actual issue was that sometimes a zero-length buffer was requested to be locked, and that always fails. On Windows 7 this was much more common, probably related to the timer coalescing introduced there causing two waits to end in a row.
Originally committed to SVN as r3740.
2009-10-27 16:54:14 +00:00
3849ab0ebd
Logic changes to installer:
...
* Protect more code with try/except blocks, hoping to crash less in some strange circumstances we haven't been able to reproduce, including the KIS 8 problem. (Updates #925 . ON ERROR RESUME NEXT)
* Instead of deleting an old Aegisub.exe, rename it to aegisub32.exe to teach Windows Distributed Link Tracking thingy that it's in fact the same thing, just with a new name.
Originally committed to SVN as r3738.
2009-10-27 00:55:23 +00:00
9682009b24
Bump version number in installer.
...
Originally committed to SVN as r3737.
2009-10-27 00:01:42 +00:00
901dfa1b32
Change installer to install a file named VSFilter-Aegisub.dll instead of VSFilter.dll to avoid conflicts with other VSFilter.dll files on the user's system.
...
Originally committed to SVN as r3736.
2009-10-27 00:00:45 +00:00
4be422335a
Update #977 , this seems to fix the bug (no more crashing, it was some uinitialised iterators) but I'm not sure if the fix should be merged to trunk too.
...
Originally committed to SVN as r3733.
2009-10-26 21:46:50 +00:00
a0bfd9ff7c
Use some black magic (GOTO) to fix #915 . See comments in code for explanation.
...
Originally committed to SVN as r3732.
2009-10-26 20:21:00 +00:00
99659ef5a4
Merge r3308, closes #440 .
...
Originally committed to SVN as r3731.
2009-10-26 19:54:07 +00:00
102070ce48
Add support for a solution-local wxWidgets installation for building 2.1.8 on Windows.
...
Originally committed to SVN as r3730.
2009-10-26 16:44:13 +00:00
e0b6c8bf47
Merge r3668 into milestone:2.1.8. Closes #1003 .
...
Originally committed to SVN as r3670.
2009-10-09 19:57:30 +00:00
a0322120e0
Remove @BOOST_CPPFLAGS@ as the boost detection is now disabled.
...
Originally committed to SVN as r3665.
2009-10-09 16:11:18 +00:00
0227c77de4
Remove boost check, the macro I'm using has serious bugs that only shows up on some systems.
...
Originally committed to SVN as r3659.
2009-10-09 15:21:59 +00:00
a67728516e
Merge r3654, Closes #998 .
...
Originally committed to SVN as r3655.
2009-10-09 14:44:25 +00:00
f4269dee62
Merge r3644 into milestone:2.1.8 for jfs, closes #1019 .
...
Originally committed to SVN as r3645.
2009-10-08 20:25:41 +00:00
555117ec75
Merge r3639 (boost check) from trunk.
...
Originally committed to SVN as r3640.
2009-10-07 03:31:58 +00:00
d15d6d6af9
Merge ass_parse.* and ass_render.h from r3446.
...
Originally committed to SVN as r3602.
2009-09-28 14:27:04 +00:00
ac0a42a77b
Merge r3545 into 2.1.8.
...
Originally committed to SVN as r3546.
2009-09-21 01:58:49 +00:00
d1b97af4aa
Merge r3408 into 2.1.8.
...
Originally committed to SVN as r3544.
2009-09-21 01:16:03 +00:00
2fa986cd01
merge r3542 (vfr export fix) into the 2.1.8 branch
...
Originally committed to SVN as r3543.
2009-09-20 20:52:00 +00:00
7784a2610c
Merge libass updates into 2.1.8: r3176, r3446, r3448.
...
Originally committed to SVN as r3491.
2009-09-05 22:30:15 +00:00
78259cfa39
Merge r3445 (German translation fixes) into 2.1.8.
...
Originally committed to SVN as r3447.
2009-09-02 02:33:42 +00:00
fc29062da1
Update ffms to r140.
...
Originally committed to SVN as r3367.
2009-08-05 23:05:22 +00:00
d615fcb3ad
Merge r3361.
...
Originally committed to SVN as r3362.
2009-08-05 04:04:30 +00:00
424f84c3aa
Merge 3355 into 2.1.8.
...
Originally committed to SVN as r3356.
2009-08-03 21:38:00 +00:00
216bf20670
Merge r3302 into 2.1.8 so dummy video works again there too.
...
Originally committed to SVN as r3303.
2009-07-28 00:57:54 +00:00
437c315536
Merged r3299 (Korean translation) into the 2.1.8 branch. This should be safe because nobody has gotten around to updating aegisub.pot for trunk yet.
...
Originally committed to SVN as r3300.
2009-07-27 23:40:10 +00:00
1f81078d75
Merge r3294 (ffms2 using utf8 cache filenames) into the 2.1.8 branch. Updates #955 .
...
Originally committed to SVN as r3298.
2009-07-27 21:49:53 +00:00
04ce442f8c
Bump kara-templater version for 2.1.8 branch.
...
Originally committed to SVN as r3279.
2009-07-25 18:22:54 +00:00
4630c0cd75
Merge r3277 into 2.1.8 branch. Updates #950 .
...
Originally committed to SVN as r3278.
2009-07-25 18:18:20 +00:00
0bb38c472b
Merge r3211 (and add the same one-line mod to the dshow provider that doesn't exist in trunk anymore) into the 2.1.8 branch.
...
Originally committed to SVN as r3213.
2009-07-23 05:01:36 +00:00
264043e1a7
Merge trunk r3192 into 2.1.8. It builds so it must be good. Updates #929 .
...
Originally committed to SVN as r3193.
2009-07-22 22:36:07 +00:00
08e93a8d7f
Merge r3152-r3153 (FFMS2 video provider YV12 fix) into the 2.1.8 branch.
...
Originally committed to SVN as r3173.
2009-07-19 18:41:03 +00:00
a5aaea0a06
Merge r3147 (caching video provider colorspace fix) into the 2.1.8 branch.
...
Originally committed to SVN as r3172.
2009-07-19 18:38:48 +00:00
a0ade19643
Merge revisions r3160-r3163 (styles manager bug fixes) into the 2.1.8 branch.
...
Originally committed to SVN as r3171.
2009-07-19 18:36:43 +00:00
65e84aeaca
Merge r3165Merge r3165 (german translation update) into the 2.1.8 branch.
...
Originally committed to SVN as r3170.
2009-07-19 18:33:55 +00:00
9234b52784
Merge r3140
...
Originally committed to SVN as r3142.
2009-07-14 23:53:40 +00:00
e7ad9b85c2
Change version from 2.1.7 -> 2.1.8 for both windows and unix.
...
Originally committed to SVN as r3136.
2009-07-14 20:57:41 +00:00
8a664e3220
Branch r3131 (milestone:2.1.7) as milestone:2.1.8, trunk will become milestone:2.2.0 any changes to the 2.1.7 tree should go here not trunk.
...
Originally committed to SVN as r3133.
2009-07-14 18:10:02 +00:00
26d3877bcf
More cleanup of local config:
...
* Remove option from Options dialogue, it's an install-time thing really
* Don't try to do file associations at startup if we're portable
* General clean up of config handling code; properly make ?user point to ?data and then everything magically follows, makes a lot of handling cleaner
Originally committed to SVN as r3131.
2009-07-14 04:51:35 +00:00
81515f024f
Properly fix "local config" option, previously it only made config.dat local and kept everything else in %APPDATA% still. Now fixed, along with a load of other problematic uses of relative paths. Still a lot more to go.
...
This also makes a bit of sense of the default options for various paths that previously were implicitly relative to ?user or ?data but never explicitly specified in options.
Originally committed to SVN as r3130.
2009-07-14 03:02:17 +00:00
26d07c7aea
Remove the dangerous CopyFile function that on Unix attempted to create hard links of files instead of copying them. Replace it with wxCopyFile instead. Patch by jfs. Fixes #912 .
...
Originally committed to SVN as r3129.
2009-07-14 02:20:40 +00:00
ccd001fbbd
Apply patch to fix #910 .
...
Originally committed to SVN as r3128.
2009-07-14 02:00:56 +00:00
28bf657fda
More minor fixes to Windows installer... we're installing VSFilter 2.39e from guliverkli2 and not one from MPC-HC, and list a couple more files for the pre-install cleanup jobs.
...
Originally committed to SVN as r3127.
2009-07-14 00:15:42 +00:00
712fd197c3
Add src/core/*.h not core/*.h to SOURCES for distfiles.
...
Originally committed to SVN as r3126.
2009-07-13 23:26:03 +00:00
27bb28190b
Even more changes to Windows installer:
...
* Include ffms2.pdb
* Have some files/actions depend on multiple components
Originally committed to SVN as r3125.
2009-07-13 23:09:30 +00:00
eaf507ca97
Fix include path for MSVC project to point to the new location of ffms2 sources.
...
Originally committed to SVN as r3124.
2009-07-13 22:43:46 +00:00
d298d21e5d
Update libass to 94d4104 from http://greg.geekmind.org/viewgit/ .
...
Originally committed to SVN as r3123.
2009-07-13 22:43:25 +00:00
Niels Martin Hansen