Commit graph

591 commits

Author SHA1 Message Date
Amar Takhar
27a1d68ec4 Call OnUnhandledException() only when wxWidgets is compiled with exception handling.
Originally committed to SVN as r4044.
2010-01-26 13:18:53 +00:00
Amar Takhar
0cd4f1225d Merge 3906,r3909,r3910,r3912,r3928,r3931,r3932,r3933,r3935,r3936: merge update checker from 2.1.8, this also needs to be documented for doxygen. closes #1084.
Originally committed to SVN as r4042.
2010-01-26 13:14:05 +00:00
Thomas Goyne
0a12e60a36 Add the Automation include path to lua's module load path.
Originally committed to SVN as r4038.
2010-01-24 19:07:34 +00:00
Thomas Goyne
7ffc3d4080 Move more of the purely OpenGL-related code into VideoOutGL from VideoDisplay and simplify the calculation of the texture grid positions slightly.
Originally committed to SVN as r4037.
2010-01-24 19:05:20 +00:00
Thomas Goyne
ba088237d7 Add some documentation for AegisubCSConv and TextFileReader.
Originally committed to SVN as r4036.
2010-01-24 18:56:51 +00:00
Amar Takhar
c7d95e5590 Add greg to the about dialog credits.
Originally committed to SVN as r4035.
2010-01-24 02:37:47 +00:00
Amar Takhar
f43bff1e97 merge r4003 (options dialogue layout fixes)
Originally committed to SVN as r4021.
2010-01-21 00:28:07 +00:00
Amar Takhar
89e2428dbe merge r3992 (restart-helper fixes)
Originally committed to SVN as r4020.
2010-01-21 00:26:45 +00:00
Amar Takhar
4221919d4f merge r3983,r4002 (more string fixes.)
Originally committed to SVN as r4019.
2010-01-21 00:24:59 +00:00
Amar Takhar
79c1716ccd merge r3982.
Originally committed to SVN as r4017.
2010-01-21 00:01:46 +00:00
Amar Takhar
e76cfae9bb Merge r3974: asserts in colour picker dialog.
Originally committed to SVN as r4015.
2010-01-20 22:49:26 +00:00
Niels Martin Hansen
f1fa69d528 Merge r3999 to trunk, updates #566.
Also, 4000 GET.

Originally committed to SVN as r4000.
2010-01-19 08:50:40 +00:00
Thomas Goyne
80fdea74e6 Merge r3994 from the 2.1.8 branch. Closes #999.
Originally committed to SVN as r3995.
2010-01-19 01:05:51 +00:00
Grigori Goronzy
8c8f59b5ff Fix ALSA player. Works On My Computer [tm].
Originally committed to SVN as r3990.
2010-01-15 22:58:51 +00:00
Grigori Goronzy
6006fb5bba Redirect mouse events from the color picker dialog to the dropper icon
to make the color dropper work on Unix/GTK. OS X still needs fixes.

Originally committed to SVN as r3975.
2010-01-12 03:19:49 +00:00
Niels Martin Hansen
7e079a3fc2 Merge r3967 from 2.1.8, closes #971.
Originally committed to SVN as r3968.
2010-01-10 16:15:31 +00:00
Niels Martin Hansen
8c036dfc3b Merge r3965 back in trunk. Closes #791.
Originally committed to SVN as r3966.
2010-01-10 16:02:01 +00:00
Thomas Goyne
8657658c70 Fix undefined behavior sometimes resulting in a crash when copying styles to or from storage when the style name already exists. Patch by Paranoja. Closes #1096.
Originally committed to SVN as r3961.
2010-01-07 00:48:27 +00:00
Thomas Goyne
a1902a0690 Remove the frequently unstable or nonfunctional attempt at automatically loading audio from the loaded video when playing with no audio loading. Updates #1090.
Originally committed to SVN as r3954.
2010-01-06 08:02:15 +00:00
Niels Martin Hansen
f805ec707e Merge r3951 from 2.1.8 back in: fixing old URLs
Originally committed to SVN as r3952.
2010-01-06 05:23:58 +00:00
Amar Takhar
dbc885fdb0 Merge r3929 to fix the video slider, updates #1073.
Originally committed to SVN as r3939.
2010-01-05 00:51:53 +00:00
Kevin Ollivier
5374441cdd Use correct framework header so that we get CFStringRef, etc. included as well.
Originally committed to SVN as r3938.
2010-01-05 00:50:09 +00:00
Thomas Goyne
8513fef7e2 Eliminate an unnecessary call to VideoContext::UpdateDisplays triggered by SubsEditBox::SetToLine, moderately improving responsiveness when working with lines that take a long time to render.
Originally committed to SVN as r3925.
2010-01-02 06:23:02 +00:00
Niels Martin Hansen
54ff8124b6 Merge r3907 back to trunk, closes #1072
Originally committed to SVN as r3908.
2009-12-27 19:49:27 +00:00
Amar Takhar
b00a77c5f5 Add missing headers to quicktime_common.cpp and video_provider_quicktime.cpp.
Originally committed to SVN as r3899.
2009-12-25 04:32:36 +00:00
Amar Takhar
face7faec3 Fix bundledirs-test target.
Originally committed to SVN as r3896.
2009-12-25 03:31:01 +00:00
Amar Takhar
6b454601da * Add a new function to libosxutil: OSX_OpenLocation which calls LSOpenCFURLRef, it accepts a URL (except for local paths) and opens the correct program using the Launcher.
* Add a new help menu option to access internal resources located within the bundle.

Closes #1033 and updates #1070.

Originally committed to SVN as r3895.
2009-12-25 03:28:15 +00:00
Amar Takhar
fff128fcfa Add support for building the QuickTime A/V providers under OSX.
Originally committed to SVN as r3893.
2009-12-24 23:06:47 +00:00
Amar Takhar
a49aa20a22 Merge r3891 (hunspell path fix.)
Originally committed to SVN as r3892.
2009-12-24 18:16:19 +00:00
Thomas Goyne
2f2f0d9aac Fix some assorted VideoOutGL-related stupidity. Updates #1056.
Originally committed to SVN as r3864.
2009-12-13 19:27:45 +00:00
Niels Martin Hansen
eb938aa5ed Check video size on open and change zoom level to 50% or 25% if the video is greater than some proportions of the window size.
Updates #1054.

Originally committed to SVN as r3858.
2009-12-12 01:38:09 +00:00
Kevin Ollivier
dd0da6744b Commit of start on waf build system. Uses the most recent waf release. Currently builds on OS X with ffmpeg, OpenAL and libass providers, do waf configure; waf build to build.
Originally committed to SVN as r3854.
2009-12-07 00:42:51 +00:00
Kevin Ollivier
31ec52b415 Fix constness issue that makes gcc on SnowLeopard fail to compile.
Originally committed to SVN as r3853.
2009-12-07 00:06:35 +00:00
Thomas Goyne
fc75937466 Make some non-mutating hotkey methods const.
Originally committed to SVN as r3852.
2009-12-05 04:26:07 +00:00
Amar Takhar
c3a6fbae6e Commit patch from Harukalover to fix prefs dialogue asserts. (tested) Updates #1053.
Originally committed to SVN as r3849.
2009-12-01 20:46:04 +00:00
Thomas Goyne
a1f3fb7dc0 Prevent times from rounding to the magic zero in the framerate transform. Updates #1007.
Originally committed to SVN as r3839.
2009-12-01 01:56:06 +00:00
Thomas Goyne
4a31f0375f Add \fs+ and \fs- to the ASS parser so they aren't killed by transforms. Updates #1007.
Originally committed to SVN as r3838.
2009-12-01 01:27:32 +00:00
Thomas Goyne
86f64b2962 Improve video operation errors somewhat. Updates #1020.
Originally committed to SVN as r3835.
2009-12-01 00:32:43 +00:00
Karl Blomster
dadd09ff49 Remove SetCacheMax() function as it is no longer used.
Originally committed to SVN as r3833.
2009-11-29 19:12:40 +00:00
Karl Blomster
e38b00fb51 Update documentation according to changes in r3831.
Originally committed to SVN as r3832.
2009-11-29 19:09:55 +00:00
Karl Blomster
abd2597d0f Change GetDesiredCacheSize() to WantsCaching() since video providers aren't setting number of frames to cache anymore.
Originally committed to SVN as r3831.
2009-11-29 19:07:53 +00:00
Karl Blomster
ed3b47b250 document new function introduced in r3829
Originally committed to SVN as r3830.
2009-11-29 19:01:32 +00:00
Karl Blomster
6b04f5ee8f Make the caching video provider use a user-configurable max cache size in bytes instead of a hardcoded number of frames. Defaults to using 32 MB (about 10 frames at 720p) of memory for the cache.
Originally committed to SVN as r3829.
2009-11-29 18:59:21 +00:00
Karl Blomster
85d645b44a Allow user to set behavior of audio decoding errors during indexing with the FFMS2 providers.
Originally committed to SVN as r3822.
2009-11-28 21:13:47 +00:00
Karl Blomster
e720bba41c Fix a bug that would occasionally cause opening audio using the ffms2 audio provider to fail with error "out of bounds track number selected".
Originally committed to SVN as r3818.
2009-11-21 22:08:03 +00:00
Karl Blomster
653427fbad Update ffms2 to r234, part 2. Compilation fixed again.
Originally committed to SVN as r3815.
2009-11-21 21:15:02 +00:00
Niels Martin Hansen
3e52c7a592 Update #1013 with a temporary fix. Changes to wxString in wx 2.9 caused the issue, because wxString::c_string() no longer returned a wchar_t* or char* and thus those weren't caught by the proper exception handler.
This fix should be replaced with a proper exception type later.

Originally committed to SVN as r3813.
2009-11-21 13:24:12 +00:00
Niels Martin Hansen
815ad4b8ca Change 2points' entry to his real name: Moritz Brunner. Updates #894.
Originally committed to SVN as r3810.
2009-11-18 18:46:43 +00:00
Amar Takhar
9058c51968 Change p-static entry to his real name: Ravi Pinjala. updates #894.
Originally committed to SVN as r3803.
2009-11-17 05:32:33 +00:00
Thomas Goyne
9ff7c6abbb Remove some unused locals in frame_main_events.cpp that were last used in r106.
Originally committed to SVN as r3800.
2009-11-17 02:43:43 +00:00