7e079a3fc2
Merge r3967 from 2.1.8, closes #971 .
...
Originally committed to SVN as r3968.
2010-01-10 16:15:31 +00:00
8c036dfc3b
Merge r3965 back in trunk. Closes #791 .
...
Originally committed to SVN as r3966.
2010-01-10 16:02:01 +00:00
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
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
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
dbc885fdb0
Merge r3929 to fix the video slider, updates #1073 .
...
Originally committed to SVN as r3939.
2010-01-05 00:51:53 +00:00
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
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
931326e3c0
Add 1020 to license header, happy new year!
...
Originally committed to SVN as r3922.
2010-01-01 21:10:34 +00:00
54ff8124b6
Merge r3907 back to trunk, closes #1072
...
Originally committed to SVN as r3908.
2009-12-27 19:49:27 +00:00
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
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
face7faec3
Fix bundledirs-test target.
...
Originally committed to SVN as r3896.
2009-12-25 03:31:01 +00:00
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
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
a49aa20a22
Merge r3891 (hunspell path fix.)
...
Originally committed to SVN as r3892.
2009-12-24 18:16:19 +00:00
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
13761bd65e
Add fi and zh_CN to LINGUAS.
...
Originally committed to SVN as r3886.
2009-12-22 18:52:33 +00:00
ebc9222f32
Merge r3879.
...
Originally committed to SVN as r3880.
2009-12-22 05:21:32 +00:00
ec6053a674
Merge r3877.
...
Originally committed to SVN as r3878.
2009-12-22 04:19:27 +00:00
2f2f0d9aac
Fix some assorted VideoOutGL-related stupidity. Updates #1056 .
...
Originally committed to SVN as r3864.
2009-12-13 19:27:45 +00:00
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
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
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
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
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
fc75937466
Make some non-mutating hotkey methods const.
...
Originally committed to SVN as r3852.
2009-12-05 04:26:07 +00:00
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
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
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
86f64b2962
Improve video operation errors somewhat. Updates #1020 .
...
Originally committed to SVN as r3835.
2009-12-01 00:32:43 +00:00
dadd09ff49
Remove SetCacheMax() function as it is no longer used.
...
Originally committed to SVN as r3833.
2009-11-29 19:12:40 +00:00
e38b00fb51
Update documentation according to changes in r3831.
...
Originally committed to SVN as r3832.
2009-11-29 19:09:55 +00:00
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
ed3b47b250
document new function introduced in r3829
...
Originally committed to SVN as r3830.
2009-11-29 19:01:32 +00:00
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
0c34323b5d
Hopefully this is the last test.
...
Originally committed to SVN as r3828.
2009-11-29 14:01:57 +00:00
ddcb31cfa9
How much whitespace does it take... (another test.)
...
Originally committed to SVN as r3827.
2009-11-29 13:31:38 +00:00
1834434b13
Another commit to test the buildbot.
...
Originally committed to SVN as r3826.
2009-11-29 13:27:56 +00:00
7709a5bbb4
Bunk commit to test the buildbot.
...
Originally committed to SVN as r3825.
2009-11-29 13:16:08 +00:00
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
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
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
653427fbad
Update ffms2 to r234, part 2. Compilation fixed again.
...
Originally committed to SVN as r3815.
2009-11-21 21:15:02 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
78ccb785cc
Fill in license information, updates #1029 .
...
Originally committed to SVN as r3766.
2009-11-05 04:24:25 +00:00
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
3c75547292
Make "Untitled" and "untitled" translateable, updates #792 .
...
Originally committed to SVN as r3761.
2009-11-04 05:27:09 +00:00
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
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
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
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
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
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
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
b2649ab510
Add libass license
...
Originally committed to SVN as r3744.
2009-10-28 00:30:12 +00:00
b587ad3b8d
Add boost license.
...
Originally committed to SVN as r3743.
2009-10-28 00:28:36 +00:00
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
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
7de7dba807
Merge r3733 for jfs, fixes #977
...
Originally committed to SVN as r3735.
2009-10-26 23:44:16 +00:00
002a5dd980
Merge r3732 for jfs, fixes #915
...
Originally committed to SVN as r3734.
2009-10-26 23:37:47 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e3583da740
Update ffms2 to r228. Removes the boost dependency.
...
Originally committed to SVN as r3690.
2009-10-12 00:11:15 +00:00
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
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
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
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
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
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
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
3873c4fc4e
Remove @BOOST_CPPFLAGS@ as the boost detection is now disabled.
...
Originally committed to SVN as r3664.
2009-10-09 16:10:59 +00:00
2623b8380f
Update universalchardet to 29631:4dd0cf2ba86f (2009-06-27). Closes #866 .
...
Originally committed to SVN as r3662.
2009-10-09 15:37:55 +00:00
61c3a3149e
Remove boost check, the macro I'm using has serious bugs that only shows up on some systems.
...
Originally committed to SVN as r3660.
2009-10-09 15:22:06 +00:00
7a53f7dd43
Fix a const issue in JpCntx.h.
...
Originally committed to SVN as r3656.
2009-10-09 14:50:43 +00:00
3bea135663
Check for lua.hpp usability not lua.h, Updates #998 .
...
Originally committed to SVN as r3654.
2009-10-09 14:43:14 +00:00
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
05c9ffde7a
Make detached video work again.
...
Originally committed to SVN as r3651.
2009-10-09 02:21:30 +00:00
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
df259693d9
Add a check for boost which is now required by ffms.. this should be backported to 2.1.8.
...
Originally committed to SVN as r3639.
2009-10-07 01:34:47 +00:00
37ec7ad62c
Increase the maximum zoom to 300%.
...
Originally committed to SVN as r3634.
2009-10-06 17:43:15 +00:00
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
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
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
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
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
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
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
4cc6610161
Commit jfs' patch to fix rounding errors as he doesn't have trunk going at the moment. Closes #1018 .
...
Originally committed to SVN as r3622.
2009-10-05 22:46:28 +00:00
40987da11a
Fix spelling of video_out_gl.cpp.
...
Originally committed to SVN as r3620.
2009-10-05 21:32:44 +00:00
e7465e7519
More reporter tweaks to make it actually build and run on Windows.
...
Originally committed to SVN as r3619.
2009-10-05 21:02:02 +00:00
d677b85b66
Add required stubs for OpenGL info to the windows platform stub.
...
Originally committed to SVN as r3618.
2009-10-05 20:55:13 +00:00
404e6cf081
Add support for flipped video to new video renderer.
...
Originally committed to SVN as r3617.
2009-10-05 20:50:04 +00:00
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
39954493c0
Add platform_windows.h and .cpp to the project.
...
Originally committed to SVN as r3614.
2009-10-05 02:43:14 +00:00
df58224b55
Add #pragma once to exception.h.
...
Originally committed to SVN as r3613.
2009-10-05 00:06:11 +00:00
0cecf3c598
Add a stub class for Windows.. whoever fills this in should take over the license.
...
Originally committed to SVN as r3612.
2009-10-03 17:45:34 +00:00
41f39f65d7
Fix locale dir under windows, I forgot to change it after copying and pasting some code from aegisub.
...
Originally committed to SVN as r3611.
2009-10-03 17:37:09 +00:00
e1469154ea
Create vcproj for reporter and make it build (but not be very useful) on windows.
...
Originally committed to SVN as r3610.
2009-10-03 17:16:52 +00:00
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
b0810a7663
Wrap() after SetFont() and don't SetMinSize() to a fixed size to calculate
...
reporter window dimensions correctly.
Originally committed to SVN as r3603.
2009-09-29 11:56:43 +00:00
c3fe549d4d
Place the OpenGL info strings into their own block. OS X reports these as completely different strings it was co-incidence that the actual vendor/card info is there on FreeBSD/Linux. It's likely other operating systems (eg. Windows) does the same thing as OS X. Eventually I'll re-add vendor information for the actual card once I figure out a way to get it on BSD/OS X.
...
Originally committed to SVN as r3601.
2009-09-28 08:08:16 +00:00
84e17451f9
Fill in most of the hardware fields for MAC.
...
Originally committed to SVN as r3600.
2009-09-28 05:16:36 +00:00
b7caa012da
Add list of available OpenGL extensions.
...
Originally committed to SVN as r3598.
2009-09-27 13:26:23 +00:00
c821a7e172
* Fix commandline support, I have no idea what the !OnInit block was after OnInit(), I removed it and everthing works as expected.
...
* Add -x switch for dumping the report to report.xml
Unfortunatly this causes a flicker of the reporter as we need to create the main frame in order to gather some desktop metrics.
Originally committed to SVN as r3597.
2009-09-27 11:30:29 +00:00
38d5f06821
* Move VideoInfo under private:
...
* Add doxygen docs for GetVideoInfo().
Originally committed to SVN as r3595.
2009-09-27 09:58:13 +00:00
b2a7247d01
Switch GetVideoInfo to use an enum and return a single value rather than use private member variables. There are a few reasons for this:
...
* Over time too many private member variables will be hard to look at.
* Speed isn't a concern, but code managability is.
* I opted to create a custom enum rather than use GLenum to avoid polluting platform.h with OpenGL headers.
Originally committed to SVN as r3594.
2009-09-27 09:50:04 +00:00
c32899df9a
* Remove Video entry as duplicates what's now under Display.
...
* Remove unessicary 'Video ' before renderer/version/vendor entries.
* Put entries under Hardware->Display and bump them to the top of the list.
Originally committed to SVN as r3593.
2009-09-27 09:27:44 +00:00
400365d831
Move OpenGL code down into Platform as it's portable now
...
Originally committed to SVN as r3592.
2009-09-27 04:15:41 +00:00
e0b36fdaff
Use wxGL to make OpenGL usage portable
...
Originally committed to SVN as r3591.
2009-09-27 03:12:17 +00:00
9230d5360a
Fix breakage due to OS X support, introduced by one of the last commits
...
Originally committed to SVN as r3590.
2009-09-27 02:18:09 +00:00
d64f10faa9
Split up video into vendor/renderer/version and acquire video
...
adapter info via OpenGL/GLX on Unix.
Originally committed to SVN as r3589.
2009-09-27 02:18:05 +00:00
eaf3353982
Fix location of config.dat on OSX.
...
Originally committed to SVN as r3588.
2009-09-27 01:53:42 +00:00
6a792f0635
Add support for OSX to the reporter, the base is from the BSD version which works seamlessly with the exception of different sysctl names. (not updated)
...
Originally committed to SVN as r3587.
2009-09-27 01:47:11 +00:00
e0d4dde970
Remove the actual files as well.
...
Originally committed to SVN as r3586.
2009-09-27 01:28:36 +00:00
877f908064
Remove the haali* files that were unintentionally introduced in r3575, they're windows-only.
...
Originally committed to SVN as r3585.
2009-09-27 01:26:34 +00:00
4d422b1997
Minor fixes to the reporter Linux support
...
* drop BSD-specific includes
* document CPU cores/count vs. logical CPU count
* close files properly
* return memory size in bytes
Originally committed to SVN as r3584.
2009-09-27 01:20:29 +00:00
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
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
ab269aac37
Set proper defines for the reporter.
...
Originally committed to SVN as r3581.
2009-09-27 00:23:32 +00:00
5217854199
Update ffms2 to r222. Fixes compilation with ancient ffmpeg's and is a better solution than verm's hack in r3578.
...
Originally committed to SVN as r3580.
2009-09-26 23:54:26 +00:00
16f5d0aea6
Make sure the reporter is built and installed as reporter-2.2.
...
Originally committed to SVN as r3579.
2009-09-26 23:09:39 +00:00
cf8b0ae97c
Comment out a couple of lines in src/core/matroskavideo.cpp and src/core/lavfvideo.cpp to get aegisub building again, thefluff is working on a proper fix.
...
Originally committed to SVN as r3578.
2009-09-26 23:05:47 +00:00
8802e0ba3d
Remove -I../src from ffms, it hasn't been needed for a very long time.
...
Originally committed to SVN as r3577.
2009-09-26 22:58:56 +00:00
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
6e39199cb4
Updating ffms2 to r221 (2.12), step 2/3: makefile
...
Originally committed to SVN as r3575.
2009-09-26 21:56:39 +00:00
6fe92bce72
Updating ffms2 to r221 (2.12), step 1/3: sources
...
Originally committed to SVN as r3574.
2009-09-26 21:56:15 +00:00
8322981b47
Use wxString in lieu of std::string to stop confusion on OSX, also makes more sense..
...
Originally committed to SVN as r3573.
2009-09-26 21:12:15 +00:00
56ff7c2133
Fix tab alignment.
...
Originally committed to SVN as r3572.
2009-09-26 20:31:28 +00:00
3ba3955e2f
Fix doxygen markup in platform_unix_linux.cpp.
...
Originally committed to SVN as r3571.
2009-09-26 20:29:25 +00:00
71065e6f66
Clarify what Features2 can be.
...
Originally committed to SVN as r3570.
2009-09-26 20:19:36 +00:00
e9c5762cf7
Remove unused header.
...
Originally committed to SVN as r3568.
2009-09-26 20:08:52 +00:00
db35bacceb
Use elif instead of nested ifdefs.
...
Originally committed to SVN as r3567.
2009-09-26 20:05:54 +00:00
ecc15a9935
Add the reporter subdir to Makefile.am so it gets built.
...
Originally committed to SVN as r3565.
2009-09-26 20:00:34 +00:00
e13ca226fb
Document the platform class and fix doxygen markup.
...
Originally committed to SVN as r3564.
2009-09-26 19:59:24 +00:00
9104079dab
Uncomment stuff to close #716 .
...
Originally committed to SVN as r3563.
2009-09-26 19:44:41 +00:00
a299f79515
Basic Linux support for the reporter.
...
Gather basic CPU and memory information by parsing /proc/cpuinfo and
/proc/meminfo.
Originally committed to SVN as r3562.
2009-09-26 16:44:36 +00:00
ce6cdd77ce
Fix reporter compilation without precompiled headers
...
Originally committed to SVN as r3561.
2009-09-26 14:53:27 +00:00
4f01dab280
Add dynamic build support for *bsd and linux.
...
Originally committed to SVN as r3560.
2009-09-26 14:50:24 +00:00
c7bbf95c9b
Add quotes around PROJECT_NAME so the space doesn't get swallowed.
...
Originally committed to SVN as r3559.
2009-09-26 09:40:49 +00:00
c98fe933a4
Add @ingroup tags and another doxygen comment.
...
Originally committed to SVN as r3558.
2009-09-26 09:38:17 +00:00
16a6616da7
Fix misnaming of a group (s/Unix/unix/)
...
Originally committed to SVN as r3557.
2009-09-26 09:31:08 +00:00
6c0e38b868
Fix a whole bunch of doxygen markup errors. Also add missing docs.
...
Originally committed to SVN as r3555.
2009-09-26 09:22:54 +00:00
3d08e60f5b
Fix main index.
...
Originally committed to SVN as r3554.
2009-09-26 09:19:12 +00:00
9df3ce3cee
SRC_PWD needs to be set before TRIM.
...
Originally committed to SVN as r3553.
2009-09-26 08:57:26 +00:00
90da141dd4
Support split projects.
...
Originally committed to SVN as r3550.
2009-09-26 08:45:19 +00:00
cda9ac3c3b
Split doxygen generation into two parts, one for aegisub and another for the reporter.
...
Originally committed to SVN as r3548.
2009-09-26 08:37:12 +00:00
dcca1694ce
* Follow aegisub and rename wx_pre.h to r_pre.h
...
* Sort headers.
* Include missing c/c++ std headers into r_pre.h
Originally committed to SVN as r3547.
2009-09-21 04:53:51 +00:00
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
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
57d549f538
unbreak the y4m provider
...
Originally committed to SVN as r3541.
2009-09-19 21:34:40 +00:00
7ba66342b0
silence a MSVC warning
...
Originally committed to SVN as r3540.
2009-09-19 20:15:59 +00:00
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
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
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
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
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
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
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
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
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
b0df329ce9
Remove un-needed inclusion of include/aegisub/exception.h
...
Originally committed to SVN as r3530.
2009-09-11 04:35:11 +00:00
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
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
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
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
774fb0f674
Fix all the headers in *., this includes:
...
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
* Sorting alphabetically.
* Same operation as r3515.
Note: This is broken when precompiled headers are not in use, I'll fix that after this commit so the two changes don't get jumbled up.
Originally committed to SVN as r3525.
2009-09-11 02:36:34 +00:00
8eda8f2a9c
Add <wx/arrstr.h> which was accidentally left out when moving the patch from one machine to the other in r3518.
...
Originally committed to SVN as r3524.
2009-09-11 02:30:10 +00:00
e4271d6aac
Add missing <fstream> header, this should fix compilation on unix/osx.
...
Originally committed to SVN as r3521.
2009-09-11 01:07:38 +00:00
b017d60e39
Forward declaration for AutoloadScriptManager too
...
Seems to work without it for others, but I have no idea why. This
shouldn't harm in this case still.
Originally committed to SVN as r3520.
2009-09-10 23:28:15 +00:00
6cc37d3f0b
A bit more cleaning of precompiled headers for Windows builds. Comment on why things are done as they are. Also move a few headers only used in single files out of the precompiled header and into the places they're actually used.
...
Originally committed to SVN as r3519.
2009-09-10 23:08:38 +00:00
88276ed1f4
* Move some headers below the rest as they need wx settings that don't seem to be inited when the header is first in the list.
...
* Add some missing headers and reposition one from the file to header.
* Revert r3516 as it's no longer needed.
Originally committed to SVN as r3518.
2009-09-10 22:48:29 +00:00
1d80d6514b
Juggle include order in agi_pre.h around a bit to make things work properly on Windows.
...
Originally committed to SVN as r3517.
2009-09-10 14:39:39 +00:00
d455a61732
Set wxUSE_CHOICEDLG to 1, I don't know why this is required I'll look at it later.
...
Originally committed to SVN as r3516.
2009-09-10 13:43:31 +00:00
d348b4e33e
Fix all the headers in *.cpp, this includes:
...
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
* Sorting alphabetically.
Originally committed to SVN as r3515.
2009-09-10 13:06:40 +00:00
Niels Martin Hansen