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
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
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
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
Amar Takhar
0c34323b5d
Hopefully this is the last test.
...
Originally committed to SVN as r3828.
2009-11-29 14:01:57 +00:00
Amar Takhar
ddcb31cfa9
How much whitespace does it take... (another test.)
...
Originally committed to SVN as r3827.
2009-11-29 13:31:38 +00:00
Amar Takhar
1834434b13
Another commit to test the buildbot.
...
Originally committed to SVN as r3826.
2009-11-29 13:27:56 +00:00
Amar Takhar
7709a5bbb4
Bunk commit to test the buildbot.
...
Originally committed to SVN as r3825.
2009-11-29 13:16:08 +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
b8561bf01d
Update ffms2 to r238. Fixes #1048 . This version is API and ABI compatible with the previous one so no further modifications are necessary.
...
Originally committed to SVN as r3820.
2009-11-28 20:04:06 +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
Karl Blomster
1f4fa82726
Update ffms2 to r234, part 1. Compilation broken in this commit.
...
Originally committed to SVN as r3814.
2009-11-21 21:11:41 +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
Amar Takhar
9a4db2b466
Use the two new macros to supply auto-detection for lua. updates #989 .
...
Originally committed to SVN as r3802.
2009-11-17 04:47:26 +00:00
Amar Takhar
932a7777be
Add two new macros (custom) to search for headers in different directories and libraries with different names. updates #989 .
...
Originally committed to SVN as r3801.
2009-11-17 04:46:46 +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
Thomas Goyne
feb77217c7
Fix bug where detaching loaded but hidden video had broken results.
...
Originally committed to SVN as r3798.
2009-11-17 01:37:18 +00:00
Amar Takhar
3719227e9e
Include wx/display.h last, it needs some values that aren't inited by display.h itself. I'm not sure if this is a bug as a lot of other headers seem to have this problem too. Fixes compilation errors when not using precompiled headers (which loads about 30 headers before this one.) This fixes non-PCH compilation updates #1040
...
Originally committed to SVN as r3794.
2009-11-15 20:53:31 +00:00
Niels Martin Hansen
3c11e2831e
Missed some headers in r3774, which caused compilation errors when precompiled headers were not used. Updates #1040 .
...
Originally committed to SVN as r3776.
2009-11-14 01:06:11 +00:00
Niels Martin Hansen
58674d1cea
Make detached video display reposition itself if it opens partially or entirely out of view. Updates #1040 .
...
Originally committed to SVN as r3774.
2009-11-14 00:42:55 +00:00
Niels Martin Hansen
d6b0cdcedf
Blind but most likely correct fix missing \iclip support in cleantags.lua. Updates #1044 .
...
Originally committed to SVN as r3772.
2009-11-13 22:13:58 +00:00
Amar Takhar
ab857d115c
Add libffms/include/*.h to the list of sources so the headers get included, found by rofflwalffls on irc, thanks!
...
Originally committed to SVN as r3769.
2009-11-07 03:08:49 +00:00
Amar Takhar
78ccb785cc
Fill in license information, updates #1029 .
...
Originally committed to SVN as r3766.
2009-11-05 04:24:25 +00:00
Amar Takhar
72ddd4ba6f
Remove reference to prs cpp file missed in r3748, updates #1012 .
...
Originally committed to SVN as r3763.
2009-11-04 07:10:15 +00:00
Niels Martin Hansen
3c75547292
Make "Untitled" and "untitled" translateable, updates #792 .
...
Originally committed to SVN as r3761.
2009-11-04 05:27:09 +00:00
Niels Martin Hansen
cd4905fe34
Fix build-error in DirectSoundPlayer2 when building Debug, signedness mismatch in an assert triggers a warning that causes an error.
...
Originally committed to SVN as r3758.
2009-11-04 04:16:25 +00:00
Niels Martin Hansen
129585a2f8
Remove the ability for Aegisub to do its own file type associations. It's something the installer should be doing.
...
Originally committed to SVN as r3757.
2009-11-03 02:42:19 +00:00
Amar Takhar
88d6c783b1
Remove boost.m4 from EXTRA_DIST it was nuked a long time ago.
...
Originally committed to SVN as r3756.
2009-11-02 21:44:08 +00:00
harukalover
3c2997e906
Fixed a crash that would occur if the mouse was left in a captured state after closing and reopening the color picker. Updates #1025
...
Originally committed to SVN as r3754.
2009-11-01 07:28:09 +00:00
Niels Martin Hansen
d2834dca45
Re-integrate r3740 from the 2.1.8 branch to fix the DirectSoundPlayer2 buffer locking bug.
...
Updates #1028 .
Originally committed to SVN as r3751.
2009-10-31 00:54:42 +00:00
Amar Takhar
afd9133fc0
Remove PRS support, I've left the files in devel/prs they can be deleted at a later time.. Closes #1012 .
...
Originally committed to SVN as r3748.
2009-10-28 01:10:11 +00:00
Amar Takhar
810c0a7eb0
Add an empty config.h and remove ../src from the build. We don't want to pollute libass with our config settings.
...
Originally committed to SVN as r3745.
2009-10-28 00:30:42 +00:00
Amar Takhar
b2649ab510
Add libass license
...
Originally committed to SVN as r3744.
2009-10-28 00:30:12 +00:00
Amar Takhar
b587ad3b8d
Add boost license.
...
Originally committed to SVN as r3743.
2009-10-28 00:28:36 +00:00
Thomas Goyne
15cf221a3f
Fix incorrect handling of flipped video when the texture size is larger than the video size.
...
Originally committed to SVN as r3742.
2009-10-27 20:59:27 +00:00
Thomas Goyne
dcfdb02e6c
Significantly reduce the number of unnecessary calls to VideoContext::GetFrame.
...
Originally committed to SVN as r3739.
2009-10-27 14:27:39 +00:00
Amar Takhar
7de7dba807
Merge r3733 for jfs, fixes #977
...
Originally committed to SVN as r3735.
2009-10-26 23:44:16 +00:00
Amar Takhar
002a5dd980
Merge r3732 for jfs, fixes #915
...
Originally committed to SVN as r3734.
2009-10-26 23:37:47 +00:00
Thomas Goyne
4fc2b90399
Add support for externally controlled frame data to AegiVideoFrame, and take advantage of this in the FFMS2 video provider to eliminate a copy of the frame data. Net speedup for seeking from beginning to end of several test files is 10-20%.
...
Originally committed to SVN as r3729.
2009-10-24 02:07:56 +00:00
Thomas Goyne
c4d07cb525
Remove AegiVideoFrame::cppAlloc, which was only needed by the dshow video provider.
...
Originally committed to SVN as r3728.
2009-10-21 04:29:15 +00:00
Thomas Goyne
7581d41935
Remove AegiVideoFrame::GetFloat and some related code as it was only there for fextracker.
...
Originally committed to SVN as r3727.
2009-10-21 04:07:00 +00:00
Thomas Goyne
df5ada1006
Make the video display only upload texture data when the frame has changed rather than every time Render is called.
...
Originally committed to SVN as r3726.
2009-10-20 19:07:18 +00:00
Amar Takhar
c72ac65d0f
Fix --enable-gcov:
...
* Rename GCOV_FLAGS -> GCOV_CFLAGS
* Add GCOV_LDFLAGS (default is -lgcov)
Originally committed to SVN as r3724.
2009-10-20 03:35:42 +00:00
Thomas Goyne
5404b45017
Tweak how the OpenGL 1.1 code behaves slightly; distortion with Windows 7's OpenGL emulation is now at most .1% instead of at most 2%.
...
Originally committed to SVN as r3723.
2009-10-19 01:11:02 +00:00
Thomas Goyne
5b9da0c56a
Fix some video output bugs related to a small maximum texture size which is not an even divisor of the video size.
...
Originally committed to SVN as r3717.
2009-10-17 03:41:12 +00:00
Thomas Goyne
3d58608230
Improve rendering with OpenGL 1.1, removing the visible seams at the cost of slight distortions at high zoom levels.
...
Originally committed to SVN as r3714.
2009-10-14 20:53:36 +00:00
Thomas Goyne
9ff8f42d7f
Get the video display closer to working with W7's emulated OpenGL. It can now display video, but there are visible seams between the textures.
...
Originally committed to SVN as r3711.
2009-10-13 22:19:31 +00:00
harukalover
59cf4b656a
Removed the log window which nobody seems to use. Closes #1026
...
Originally committed to SVN as r3710.
2009-10-13 21:53:50 +00:00
Thomas Goyne
3032c4f883
Fix a memory leak and a minor graphical glitch that sometimes happened to the video slider when switching visual typesetting modes.
...
Originally committed to SVN as r3709.
2009-10-13 17:28:39 +00:00
Thomas Goyne
389f296b4d
Make the video display actually hide when the detached video dialog is minimized.
...
Originally committed to SVN as r3706.
2009-10-13 04:10:55 +00:00
Amar Takhar
ddc3b57694
How lazy can I get for not regening configure to test this change... (yes, i did this time around.) Updates #1023 .
...
Originally committed to SVN as r3703.
2009-10-12 06:06:44 +00:00
harukalover
7dcb6cd387
Fix the annoying habit of all debug output being printed twice
...
Originally committed to SVN as r3701.
2009-10-12 05:11:24 +00:00
Amar Takhar
669e11d10b
Remove boost check as ffms has removed the usage of boost::format. This is trunk-only for now. Updates #1023 .
...
Originally committed to SVN as r3691.
2009-10-12 00:14:36 +00:00
Karl Blomster
e3583da740
Update ffms2 to r228. Removes the boost dependency.
...
Originally committed to SVN as r3690.
2009-10-12 00:11:15 +00:00
Thomas Goyne
68de84b427
Fix some minor quirks with detached video and the display mode.
...
Originally committed to SVN as r3688.
2009-10-11 22:10:08 +00:00
Thomas Goyne
5cf7724698
Disable zoom controls when video is detached as the zoom is ignored with detached video.
...
Originally committed to SVN as r3676.
2009-10-10 15:21:26 +00:00
Thomas Goyne
75f010f889
Make global hotkeys work when the detached video dialog is focused.
...
Originally committed to SVN as r3675.
2009-10-10 15:05:17 +00:00
Thomas Goyne
c0364b7be1
Remove pointless keydown handlers on things that can't have keyboard focus.
...
Originally committed to SVN as r3674.
2009-10-10 02:13:15 +00:00