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
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
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
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
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
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
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
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
Thomas Goyne
983434a6c3
Make the video slider forward unprocessed key events to the video display.
...
Originally committed to SVN as r3672.
2009-10-09 22:27:27 +00:00
harukalover
36386e74fc
Fixed the jump to dialog never displaying anything but 0 in the hour column. Updates #1003 .
...
Originally committed to SVN as r3668.
2009-10-09 19:43:43 +00:00
Amar Takhar
14e2d9ad12
Add config.h to 8 files that were missing it, _all_ source files must include config.h at the very top.
...
Originally committed to SVN as r3666.
2009-10-09 16:34:38 +00:00
Amar Takhar
42e0dd6ce4
Update universalchardet using a patch I made around 2009-02, the one we're currently using is from ~1998. I'll check again later to see if there are any updates to it before closing the ticket. Updates #866 .
...
Originally committed to SVN as r3653.
2009-10-09 14:30:27 +00:00
Thomas Goyne
05c9ffde7a
Make detached video work again.
...
Originally committed to SVN as r3651.
2009-10-09 02:21:30 +00:00
Amar Takhar
85d3ea9277
Commit patch for #1019 for jfs' as he doesn't have the branch compiling locally, I'll merge this to milestone:2.1.8 after this, updates #1019 .
...
Originally committed to SVN as r3644.
2009-10-08 20:24:25 +00:00
Thomas Goyne
37ec7ad62c
Increase the maximum zoom to 300%.
...
Originally committed to SVN as r3634.
2009-10-06 17:43:15 +00:00
Thomas Goyne
1f27582b50
Remove some members of VideoContext that are no longer used with the rewritten video display.
...
Originally committed to SVN as r3633.
2009-10-06 16:19:36 +00:00
Thomas Goyne
bead7360c4
Delete threaded video mode, as it never worked in the first place and is fundamentally flawed.
...
Originally committed to SVN as r3632.
2009-10-06 16:12:23 +00:00
Amar Takhar
9217476357
Bitten by precompiled headers round 2: the OpenGL headers must be included before the local headers.
...
Originally committed to SVN as r3631.
2009-10-06 16:08:39 +00:00
Amar Takhar
ac260ec47b
Sigh, bitten by precompiled headers, wxLogDebug requires <wx/log.h>.
...
Originally committed to SVN as r3630.
2009-10-06 15:47:43 +00:00
Amar Takhar
c204c766ec
Add two more debug printfs:
...
* Print the WxH of the frame size.
* Print the size of the texture actually used.
Originally committed to SVN as r3629.
2009-10-06 15:28:22 +00:00
Amar Takhar
bb4506354f
Add a debug printf to display what texture sizes VideoOutGL::TestTexture is checking.
...
Originally committed to SVN as r3628.
2009-10-06 14:58:32 +00:00
Amar Takhar
21c5e7909c
svn:eol-style native and svn:keywords Id to relevent files.
...
Originally committed to SVN as r3623.
2009-10-05 23:04:30 +00:00
Thomas Goyne
40987da11a
Fix spelling of video_out_gl.cpp.
...
Originally committed to SVN as r3620.
2009-10-05 21:32:44 +00:00
Thomas Goyne
404e6cf081
Add support for flipped video to new video renderer.
...
Originally committed to SVN as r3617.
2009-10-05 20:50:04 +00:00
Thomas Goyne
cbd76e7010
Rewrite the video rendering code to support displaying videos which are larger than the maximum texture size. This does not currently support YV12 (which Aegisub currently never uses), but should be otherwise functional.
...
Originally committed to SVN as r3615.
2009-10-05 04:22:28 +00:00
Thomas Goyne
df58224b55
Add #pragma once to exception.h.
...
Originally committed to SVN as r3613.
2009-10-05 00:06:11 +00:00
Thomas Goyne
d54ddc688b
Make font_file_lister.cpp build on windows when freetype2 is disabled (broken by r3536).
...
Originally committed to SVN as r3609.
2009-10-02 23:15:31 +00:00
Grigori Goronzy
6ce51f9435
Add a forward declaration which is apparently needed with certain gcc
...
versions
Originally committed to SVN as r3583.
2009-09-27 01:20:12 +00:00
Karl Blomster
6490c82e79
Change the way ffms2 index cache files are named to use source filename (without path) + source file's size in bytes + source file modification time, instead of just source file path + size in bytes, in order to make reusing index cache files on other computers easier. Closes #1008 .
...
Originally committed to SVN as r3582.
2009-09-27 00:32:19 +00:00
Karl Blomster
9d80eb066f
Updating ffms2 to r221 (2.12), step 3/3: Aegisub interface
...
Originally committed to SVN as r3576.
2009-09-26 21:58:00 +00:00
Niels Martin Hansen
9104079dab
Uncomment stuff to close #716 .
...
Originally committed to SVN as r3563.
2009-09-26 19:44:41 +00:00
Karl Blomster
fcd8f4e04e
Throw an error instead of crashing if user attempts to load audio with bitdepth >16bits/sample. Updates #996 .
...
Originally committed to SVN as r3545.
2009-09-21 01:52:34 +00:00
Karl Blomster
3edb446bec
Fix (?) a bug that caused VFR transformation export to be broken, which also affected certain video providers when external timecodes were used.
...
Originally committed to SVN as r3542.
2009-09-20 20:45:54 +00:00
Karl Blomster
57d549f538
unbreak the y4m provider
...
Originally committed to SVN as r3541.
2009-09-19 21:34:40 +00:00
Karl Blomster
7ba66342b0
silence a MSVC warning
...
Originally committed to SVN as r3540.
2009-09-19 20:15:59 +00:00
Amar Takhar
fa9c8c17f8
Remove 35 of the 39 pragma once added in r3538. I didn't realise so many would be not required. This patch isn't tested on windows, I'll fix it after the buildbot takes a run at it.
...
Originally committed to SVN as r3539.
2009-09-18 03:01:51 +00:00
Amar Takhar
11e1935d76
Remove include guards in favour of '#pragma once'. Normally I would use an include guard however #pragama once is easier to spot and we already used it in mst of our files, this is for the sake of consistency until they're removed.
...
Originally committed to SVN as r3538.
2009-09-18 02:48:31 +00:00
Amar Takhar
aea050fbee
I have no idea how or why this change got in, but fix a license line wrap.
...
Originally committed to SVN as r3537.
2009-09-16 12:19:52 +00:00
Amar Takhar
aba73d4308
Remove 'pragma once' from colour_button.h font_file_lister.h gl_wrap.h subs_edit_ctrl.h.
...
Originally committed to SVN as r3536.
2009-09-16 12:18:09 +00:00
Amar Takhar
130e840028
I thought subtitles_provider.h was in src/ I didn't realise it was an include when trying to revert it. Of course I'd have noticed that beforehand if I was paying attention to what svn told me. This should have been in r3533.
...
Originally committed to SVN as r3535.
2009-09-11 19:21:19 +00:00
Amar Takhar
f41123aad4
Wrap shlobj.h with WIN32 again, it got removed in a previous commit.
...
Originally committed to SVN as r3534.
2009-09-11 18:55:33 +00:00
Amar Takhar
8504b4790d
Remove '#pragma once' from 84 files that don't need it. Thanks to Plorkyeran for testing this on windows. The next step is to detangle the remaining files that currently require it.
...
Originally committed to SVN as r3533.
2009-09-11 18:51:48 +00:00
Amar Takhar
a874981ed7
ass_entry.h actually does need include/aegisub/exception.h, didn't notice because of precompiled headers.
...
Originally committed to SVN as r3532.
2009-09-11 05:04:05 +00:00
Amar Takhar
ca01bb2b86
Add an include guard in agi_pre.h, for whatever reason GCC likes to include the precompiled header twice. I've added a note that this needs to be looked at eventually.
...
Originally committed to SVN as r3531.
2009-09-11 04:35:45 +00:00
Amar Takhar
b0df329ce9
Remove un-needed inclusion of include/aegisub/exception.h
...
Originally committed to SVN as r3530.
2009-09-11 04:35:11 +00:00
Amar Takhar
b116610d12
Add missing headers that are in agi_pre.h but not the actual header, should fix the non-precompiled header build.
...
Originally committed to SVN as r3529.
2009-09-11 02:59:48 +00:00
Niels Martin Hansen
42a293ccca
As <aegisub/exception.h> should become widely used soon enough, add it to the precompiled headers.
...
Protect <omp.h> from inclusion on compilers that don't support OpenMP.
Originally committed to SVN as r3528.
2009-09-11 02:49:58 +00:00
Niels Martin Hansen
d1c70ef6d2
Protect agi_pre.h from double inclusion during PCH generation in MSVC.
...
Originally committed to SVN as r3527.
2009-09-11 02:47:14 +00:00
Niels Martin Hansen
a3bf534b5e
Fixes for internal logical consistency of exception.h. (Make sure we can actually support inner exceptions in all cases.)
...
Also make it follow the AGI_PRE pattern.
Originally committed to SVN as r3526.
2009-09-11 02:46:01 +00:00