Commit graph

3983 commits

Author SHA1 Message Date
Amar Takhar
ac2a41e9f0 Fix location of wx-config to the general link.
Originally committed to SVN as r4039.
2010-01-25 15:13:26 +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
4a42ab1403 merge r4011,r4012 (Switch from Mac::Finder::DSStore to using AppleScript)
Originally committed to SVN as r4025.
2010-01-21 00:37:04 +00:00
Amar Takhar
e247dec1f3 Merge r4010,r4013,r4014 (configure and bundle/dmg generation fixes.)
Originally committed to SVN as r4024.
2010-01-21 00:34:45 +00:00
Amar Takhar
113ae0cd6d merge r4007 (optimisation flag fix.)
Originally committed to SVN as r4023.
2010-01-21 00:30:42 +00:00
Amar Takhar
73ab47f8ec merge r3986 (configure release support.
Originally committed to SVN as r4022.
2010-01-21 00:29:26 +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
Amar Takhar
361f5228ba Merge r3977 (osx-fix-libs) from 2.1.8 closes #964.
Originally committed to SVN as r3978.
2010-01-12 13:00:24 +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
Grigori Goronzy
e341e05fa2 Update libass to commit 8db4a5.
Originally committed to SVN as r3970.
2010-01-10 21:09:48 +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
Amar Takhar
931326e3c0 Add 1020 to license header, happy new year!
Originally committed to SVN as r3922.
2010-01-01 21:10:34 +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
fb9ddc45a3 We're using wx-trunk for OSX now, as the cocoa port is far ahead of the 2.9 branch.
Originally committed to SVN as r3905.
2009-12-26 00:26:37 +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
e00936c3bf Add AC_PROG_RANLIB to configure.in, fixes 'make distclean'
Originally committed to SVN as r3898.
2009-12-25 04:31:59 +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
Amar Takhar
660e392423 Update chinese translation -- this is an old version that was updated 2 days after the original submission. Unfortunatly it was never comitted.
Originally committed to SVN as r3887.
2009-12-22 19:18:29 +00:00
Amar Takhar
13761bd65e Add fi and zh_CN to LINGUAS.
Originally committed to SVN as r3886.
2009-12-22 18:52:33 +00:00
Amar Takhar
ebc9222f32 Merge r3879.
Originally committed to SVN as r3880.
2009-12-22 05:21:32 +00:00
Amar Takhar
ec6053a674 Merge r3877.
Originally committed to SVN as r3878.
2009-12-22 04:19:27 +00:00
Amar Takhar
69770d53d4 Switch automake version(s) to 1.10 from 1.9.
Originally committed to SVN as r3868.
2009-12-13 20:00:04 +00:00
Amar Takhar
e82ea9d8b2 Fix some errors + better formatting for the custom email message. Also set it to only report problems and not successful builds.
Originally committed to SVN as r3867.
2009-12-13 19:58:34 +00:00
Amar Takhar
3e83cb7597 Add URL to transposed grid display.
Originally committed to SVN as r3866.
2009-12-13 19:56:31 +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
Amar Takhar
fedd8ecce6 Commit a different patch than the one in #1064.. this sets the default automake required version to 1.10.. the detection for 1.11 is *after* 1.11 because we prefer to use that, though we do prefer to use 1.11 than 1.9 if it's available. Updates #1064
Originally committed to SVN as r3862.
2009-12-13 17:47:19 +00:00
Amar Takhar
608a73677d Remove /usr/share/fonts and /usr/X11R6/lib/fonts from fonts.conf. These will never be used under OSX they're for Unix and X respectivly. /usr/share/fonts is only useful for Unix users and the X path is useless under Aqua.
Originally committed to SVN as r3860.
2009-12-12 03:47:51 +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