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
Niels Martin Hansen