Commit graph

718 commits

Author SHA1 Message Date
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
Amar Takhar 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
Amar Takhar 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
Amar Takhar 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
Grigori Goronzy 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
Niels Martin Hansen 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
Amar Takhar 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
Niels Martin Hansen 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
Amar Takhar 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
Amar Takhar 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
Amar Takhar 79397825cf Add missing wx/log.h, sort headers.
Originally committed to SVN as r3514.
2009-09-10 10:51:49 +00:00
Amar Takhar 7a8c5229fd * Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed.
* Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list
 * Use <> versus "" for the wx header in avisynth_wrap.cpp
 * Remove xx/wx.h from agi_pre.h as it's included by wxprec.h.

Originally committed to SVN as r3513.
2009-09-10 10:26:50 +00:00
Amar Takhar 84996c927f Add a whole slew of missing includes, prior to r3509 config_unix.h used to include stdwx.h, now that I'm fixing the headers I removed it which caused issues when not using precompiled headers.
Originally committed to SVN as r3512.
2009-09-10 05:25:25 +00:00
Amar Takhar 6a7e4769e3 Add several dozen more headers to agi_pre.h
Originally committed to SVN as r3510.
2009-09-10 04:29:04 +00:00
Amar Takhar 05ae13a8ab * Rename stdwx.h to agi_pre.h as it doesn't include wx headers only, it's confusing.
* Rename include guard to AGI_PRE.

Originally committed to SVN as r3509.
2009-09-10 04:14:28 +00:00
Thomas Goyne 132d8ba3ac Move #include "config.h" to before #define WX_PRE so that it does gets included at some point.
Originally committed to SVN as r3508.
2009-09-10 03:14:09 +00:00
Thomas Goyne e0cc5fc038 Wrap wx includes with _CRT_SECURE_NO_WARNINGS to make msvc stop hurfing and durfing.
Originally committed to SVN as r3507.
2009-09-10 02:52:34 +00:00
Amar Takhar bdbb8cc4ce Wrap config.h with WX_PRE so it doesn't get included twice. stdwx.h requires it to be included.
Originally committed to SVN as r3506.
2009-09-10 02:42:06 +00:00
Amar Takhar 3c1b52eb69 Add 79 missing wx includes to stdwx.h, the build is much faster on unix, should be the same for windows.
Originally committed to SVN as r3505.
2009-09-10 02:32:55 +00:00
Amar Takhar deeec2de18 Re-organise stdwx.h and sort alphabetically.
Originally committed to SVN as r3504.
2009-09-10 02:27:25 +00:00
Amar Takhar 925fa88c0c * Remove #pragma once.
* Sort wx headers and wrap with #ifndef WX_PRE.
 * Add missing heade rto stdwx.h.
M    src/ass_attachment.h
M    src/subs_grid.cpp
M    src/ass_dialogue.cpp
M    src/ass_attachment.cpp
M    src/aegisub_endian.h
M    src/audio_display.cpp
M    src/audio_karaoke.cpp
M    src/dialog_kara_timing_copy.cpp
M    src/ass_dialogue.h
M    src/text_file_writer.cpp
M    src/stdwx.h

Originally committed to SVN as r3503.
2009-09-10 02:23:43 +00:00
Amar Takhar d519f4589d * Remove main.h from files that don't require it.
* Remove include guard in main.h as it's no longer required.
 * Sort wx headers and wrap with #ifndef WX_PRE.
 * Add #define WX_PRE to stdwx.h.

Originally committed to SVN as r3502.
2009-09-10 02:07:55 +00:00
Thomas Goyne 1a4e7375fd Add some documentation to VideoDisplay and clean up the includes a bit.
Originally committed to SVN as r3501.
2009-09-10 01:41:34 +00:00
Amar Takhar 0992a68488 Rewrite how wxStackWalker works:
* Change from fstream to wxFile.
 * Create both text-based and xml based reports (for the reporter)

Originally committed to SVN as r3499.
2009-09-09 07:04:10 +00:00
Grigori Goronzy 5ab1eab906 OSS player: handle changing end position correctly
If the slider is moved to the playbar while the player is running,
the playback needs to be stopped.  Handle this situation properly.

Additionally, select a low-latency buffer policy if possible (OSS4
only).  This will make it possible to move the slide near the playbar
without stopping playback (the current writing position is always in
advance of the playback position by the buffer size!)

Originally committed to SVN as r3498.
2009-09-09 03:24:34 +00:00
Grigori Goronzy 9d0daf6821 Add OSS audio player
Tested on OSS4 (4front), FreeBSD 7.2 OSS and with ALSA's OSS emulation.
Bear with me, this is both my first serious C++ and OSS code.

Originally committed to SVN as r3497.
2009-09-08 22:06:07 +00:00
Amar Takhar b258daa120 Add the new icons + new source paths to EXTRA_DIST, it was still set to the XPMs.
Originally committed to SVN as r3496.
2009-09-06 02:39:32 +00:00
Amar Takhar a5730828d3 Remove __APPLE__ around SetBitmap() in AppendBitmapMenuItem, this gives us pretty icons in our menus on osx.
Originally committed to SVN as r3495.
2009-09-06 00:41:38 +00:00
Amar Takhar c89dcae7fc Don't attempt to draw a NULL bitmap, OSX doesn't like this. (i'd gather that none of the other platforms do either but on osx it causes a crash.
Originally committed to SVN as r3488.
2009-09-05 04:06:38 +00:00
Amar Takhar 53b3f8468c Remove old MacRegisterDefaultTypeAndCreator that no longer wxist in wxCocoa. Add a note about how this is handled on unix and a todo item for fixing this on OSX.
Originally committed to SVN as r3487.
2009-09-05 03:56:45 +00:00
Amar Takhar e545c96dc8 OSX doesn't like it when combo boxes are empty, so init styles to "Default" and actor to "Actor".
Originally committed to SVN as r3485.
2009-09-05 02:24:52 +00:00
Amar Takhar 2d96c5bf4b Remove a bunch of __WXMAC__ entries that are no longer required.
* Options uses a TreeBook like every other platform
 * Browse button now works in osx
 * wxGLCanvas is now the same as windows/unix

Originally committed to SVN as r3484.
2009-09-05 01:16:23 +00:00
Amar Takhar 878f451d72 Remove an old hack required for wx2.8, this is no longer required for 2.9. Closes #850.
Originally committed to SVN as r3483.
2009-09-04 05:12:49 +00:00
Amar Takhar 1155d1bcf8 wxUSE_STACKWALKER is defined to 0/1, so #ifdef doesn't work. (noticed by plork)
Originally committed to SVN as r3474.
2009-09-03 06:03:38 +00:00
Amar Takhar 95812a6c79 Mark DecodePathMaybeRelative as depreciated this is a legacy function that's a pain and no longer required for 2.2 it needs to be removed eventually.
Originally committed to SVN as r3473.
2009-09-03 05:27:49 +00:00
Amar Takhar 78b0765608 Vastly simplify saving of backup .ass files when crashing.
* Remove "Autorecovery path" option, this should not be user configurable.
 * Crashes are now saved as recovered/YYYY-MM-DD-HHMMSS_<name>.ass (no pruning)

Originally committed to SVN as r3472.
2009-09-03 05:27:11 +00:00
Amar Takhar 01df6ba169 Remove the dual exception messages and strip it down to 1 short one, removing all references to crashlog.txt.
Originally committed to SVN as r3471.
2009-09-02 20:46:15 +00:00
Amar Takhar bf275da4de Revert r3462, this is the same issue as described in r3466. Someone on windows will need to sort this out.
Originally committed to SVN as r3470.
2009-09-02 11:03:52 +00:00
Amar Takhar 65d2eda681 Silence warnings in MatroskaParser.c
Originally committed to SVN as r3469.
2009-09-02 10:06:25 +00:00
Amar Takhar 4aa6975a8d Whoops, I mis-placed the parentheses in r3458.
Originally committed to SVN as r3468.
2009-09-02 10:04:36 +00:00
Amar Takhar 46c824442b Remove useless typedef
Originally committed to SVN as r3467.
2009-09-02 10:04:03 +00:00
Amar Takhar e1a23412ac Revert r3461.. on unix iconv requires const char**, however for whatever reason msvc is complaining it can't convert it to char**. I have no idea why someone on windows will have to debug it.
Originally committed to SVN as r3466.
2009-09-02 09:40:52 +00:00
Amar Takhar 430286cf69 Silence warnings for the pulseaudio player.
Originally committed to SVN as r3465.
2009-09-02 09:00:03 +00:00
Amar Takhar 3aa7424998 Sprinkle const to remove warnings, add {} behind a while loop.
Originally committed to SVN as r3464.
2009-09-02 08:48:07 +00:00
Amar Takhar 7237e44291 Switch from long to wxCoord to remove warnings.
Originally committed to SVN as r3463.
2009-09-02 08:45:09 +00:00
Amar Takhar 256671d666 Add (const char**) cast to inptr in iconv to silence warning.
Originally committed to SVN as r3462.
2009-09-02 08:41:29 +00:00
Amar Takhar a02a63c4e5 Sprinkle const to remove warnings.
Originally committed to SVN as r3461.
2009-09-02 08:31:58 +00:00
Amar Takhar 89284f5a1c Sprinkle const to remove warnings.
Originally committed to SVN as r3460.
2009-09-02 08:28:30 +00:00
Amar Takhar 2bd2b7f3a3 Add empty {}'s after while statements to silence warnings (and for safety!
Originally committed to SVN as r3459.
2009-09-02 08:26:52 +00:00
Amar Takhar a16c8ed838 Add parentheses to silence warning. (and for clarity)
Originally committed to SVN as r3458.
2009-09-02 08:23:18 +00:00
Amar Takhar 24c7ceb0ab Add parentheses to silence warning. (and for clarity)
Originally committed to SVN as r3457.
2009-09-02 08:21:09 +00:00
Amar Takhar aacc50702f Add empty {}'s after while statements to silence warnings (and for safety!
Originally committed to SVN as r3456.
2009-09-02 08:19:24 +00:00
Amar Takhar 586f2297fc Add const to langs[] to silence warnings.
Originally committed to SVN as r3455.
2009-09-02 08:18:11 +00:00
Amar Takhar eceb72d95e Add (const char*) to silence warning to strcmp.
Originally committed to SVN as r3454.
2009-09-02 08:10:59 +00:00
Amar Takhar eb807fea3d Add (char *) before string constant to silence warning. to ass_read_memory.
Originally committed to SVN as r3453.
2009-09-02 08:06:51 +00:00
Amar Takhar 77e2eaef04 Comment two unused variables to silence warnings.
Originally committed to SVN as r3452.
2009-09-02 08:04:45 +00:00
Amar Takhar aef7375ddb * Add a new define WITH_EXCEPTIONS to allow exception handling to be forced on when in debug mode.
* Add --enable-debug-exceptions to set WITH_EXCEPTIONS.
 * Fix precompiled header msg using AC_RESULT. (forgot this in the original patch)

Originally committed to SVN as r3451.
2009-09-02 07:59:17 +00:00
Grigori Goronzy a9b80dea4c Update libass and adjust to API changes.
Update the internal libass copy to git commit cf7c6e4c and fix the
libass provider; libass types were renamed.

Originally committed to SVN as r3446.
2009-09-02 01:23:51 +00:00
Niels Martin Hansen 64c642c142 Revert r3431, it breaks the clipboard on Windows and is in fact also incorrect usage of the primary selection in X11 context. (I have never heard of anyone claiming clipboard usage not working on X11 before.)
This comment is in `include/wx/clipbrd.h`:
{{{
    // this allows to choose whether we work with CLIPBOARD (default) or
    // PRIMARY selection on X11-based systems
    //
    // on the other ones, working with primary selection does nothing: this
    // allows to write code which sets the primary selection when something is
    // selected without any ill effects (i.e. without overwriting the
    // clipboard which would be wrong on the platforms without X11 PRIMARY)
}}}
Note that it says that primary selection enabled causes the clipboard to do nothing on platforms that have no concept of primary selection, such as Windows and Mac.

On X11 the primary selection should only reflect an active selection of text (or similar) that the user has performed, and the contents of the primary selection buffer will essentially change all the time as the user changes selection. When the user chooses to explicitly copy something to the clipboard (as is the case with Aegisub, the only operation supported by us currently) the data is placed in a less ephemeral buffer which is the actual clipboard, separate from the primary selection, allowing the user to change the primary selection further without affecting the clipboard.

Originally committed to SVN as r3443.
2009-08-28 21:45:01 +00:00
Niels Martin Hansen b1225cdd1f Correct a use of wx event handling, which should also make FrameMain not require friend access to AudioDisplay.
Originally committed to SVN as r3442.
2009-08-28 21:15:39 +00:00
Amar Takhar 28a79d49ac Whoops, I nuked the reference counter initilisation by accident. in r3440.
Originally committed to SVN as r3441.
2009-08-25 05:31:20 +00:00
Amar Takhar 3eff6459cb * Clean up doxygen comments.
* Fix spacing between blocks.
 * Add some debugging info.

Originally committed to SVN as r3440.
2009-08-25 05:17:07 +00:00
Amar Takhar e0f84274b0 Add the languages button that was missed in r3437.
Originally committed to SVN as r3439.
2009-08-22 03:59:09 +00:00
Amar Takhar 3de6c63ddd Reformat the 'Enter aspect ratio' text to be formatted as a block rather than a very wide string that looked silly.
Originally committed to SVN as r3438.
2009-08-22 03:56:02 +00:00
Amar Takhar 775c73de29 Add new icons from Kaverin.
Originally committed to SVN as r3437.
2009-08-22 03:51:00 +00:00
Amar Takhar 0def838ef2 Add modified buttons from r3435.
Originally committed to SVN as r3436.
2009-08-22 03:50:12 +00:00
Amar Takhar 8ba5aa27be Move stream position info into it's own struct.. Looks like a few globals can't be helped due to how the AudioPlayer class is designed. If I have to use globals I'll atleast make them easier to manage.. Updates #997.
Originally committed to SVN as r3434.
2009-08-21 21:40:18 +00:00
Amar Takhar 5ea99a65e7 Remove unused global 'stopping' and remove unused mutex code. Updates #997.
Originally committed to SVN as r3433.
2009-08-21 20:28:43 +00:00
Amar Takhar 2df6b2fd38 Remove 'playing' global in favour of an IsPlaying function that uses Pa_IsStreamActive(). Updates #997.
Originally committed to SVN as r3432.
2009-08-21 20:08:58 +00:00
Amar Takhar f5a9af6a6c Call wxTheClipboard->UsePrimarySelection(true) when using wxClipboard, without getting into detail clipboard work very differently on X11. Without calling this copying to the clipboard won't work. I've just put it after every use of ->Open, this is safe as in every case Close() is called right after. This will fix clipboard copying on all unices.
Originally committed to SVN as r3431.
2009-08-20 02:31:33 +00:00
Amar Takhar 50d9dbd4f1 Add detach_video_menu and show_overscan_menu_checked <- this one isn't in use as you can't Check() a menu item that has a bitmap, we need to figure out an alternate solution. This probably involves flipping the bitmap to our own of a checkmark.
Originally committed to SVN as r3430.
2009-08-19 07:03:39 +00:00
Amar Takhar 2bf5f6656e Commit modified buttons from r3428.
Originally committed to SVN as r3429.
2009-08-19 06:48:50 +00:00
Amar Takhar b2f4c07de9 PNG versions from r3426.
Originally committed to SVN as r3427.
2009-08-18 06:23:06 +00:00
Amar Takhar 58965afc9a * Delete find_replace_button and find_next_button (these were blank anyway) and replace them with find_next_menu and find_replace_menu.
* Add new buttons open_audio_menu, open_audio_from_video_menu, close_audio_menu and close_video_menu.

Originally committed to SVN as r3425.
2009-08-18 01:28:15 +00:00
Amar Takhar 5cfa19f6b9 Add png versions of the modified SVG buttons from r3423.
Originally committed to SVN as r3424.
2009-08-18 01:24:00 +00:00
Niels Martin Hansen f3e84bea88 Some more cache management stuff for the audio rendering.
Originally committed to SVN as r3421.
2009-08-16 16:22:59 +00:00
Niels Martin Hansen 4526b0dc43 Try to get around G++'s dislike of my iterators by using an integer index instead.
Originally committed to SVN as r3419.
2009-08-16 04:31:29 +00:00
Amar Takhar b37310e286 Add a bunch of new icons from Kaverin.
Originally committed to SVN as r3418.
2009-08-16 03:54:44 +00:00
Niels Martin Hansen 56b40bc67a Will GCC like me better if I sprinkle some 'typename' around?
Originally committed to SVN as r3417.
2009-08-16 03:50:41 +00:00
Niels Martin Hansen c97f91c137 Fix compilation errors on GCC.
Also fix a bug in the block cache where it wasn't the sorted order of the macroblocks by access count that was used in determining which ones to kill off.

Originally committed to SVN as r3415.
2009-08-16 01:10:20 +00:00
Niels Martin Hansen e9e3b2d107 Change AudioRenderer to use DataBlockCache.
Originally committed to SVN as r3414.
2009-08-16 00:28:26 +00:00
Niels Martin Hansen d29d267cce Did I say we were going to use a B+ tree for caching stuff? No I didn't, I never said so!
(Revert r3411 and r3410.)

Originally committed to SVN as r3413.
2009-08-15 21:56:28 +00:00
Niels Martin Hansen 76d94ec94c Add DataBlockCache template class. It parses but I don't know if it compiles yet.
Updates #951, #965, #990.

Originally committed to SVN as r3412.
2009-08-15 21:48:58 +00:00
Amar Takhar 324094960b Add btree/*.h to _SOURCES.
Originally committed to SVN as r3411.
2009-08-15 04:21:50 +00:00
Niels Martin Hansen 60e2cf3790 Add Anton Fedoruk's B+ Tree implementation, intended to be used for for audio display caching among other things.
Originally committed to SVN as r3410.
2009-08-15 04:20:25 +00:00
Amar Takhar 3b1a722e5c Add a \n after Kaverins entry to wrap (noticed by kaverin).
Originally committed to SVN as r3409.
2009-08-14 05:18:20 +00:00
harukalover 34913135c9 Removed a condition which would make clicking on a line that was already selected never update the editbox, this was wrong since the line's text can be changed by functions outside of direct editing in the editbox (e.g. automation scripts)
Originally committed to SVN as r3408.
2009-08-14 05:08:29 +00:00
Amar Takhar a31139a408 Reverse tooltips for the Cancel/Accept buttons in Split mode... I checked all of this carefully before I comitted, I guess I read what I wanted to see. (noticed by Kaverin)
Originally committed to SVN as r3407.
2009-08-14 04:57:32 +00:00
Amar Takhar edc7b00b97 PNG versions of the modified buttons.
Originally committed to SVN as r3406.
2009-08-14 03:17:16 +00:00
Amar Takhar bebc71ef53 Change how the Split/Join mode buttons work. Previously there was a weird hack used to change the text of the buttons when the various modes were used. When switching to icons this was no longer possible -- Well you could switch the bitmap dynamically but that's really gross. Instead the two pairs of buttons are put into their own BoxSizers which are Shown and Hidden when each mode is used.
Originally committed to SVN as r3404.
2009-08-14 03:11:34 +00:00
Thomas Goyne 696e76379e Make the hotkeys for the visual typesetting modes customizable. Closes #992
Originally committed to SVN as r3402.
2009-08-13 22:07:43 +00:00
Niels Martin Hansen fd65666eb2 Forgot to change filenames in doxy comments when renaming audio_spectrum.*.
Originally committed to SVN as r3400.
2009-08-13 17:28:12 +00:00
Niels Martin Hansen dcebd9be94 Add constructor and destructor to AudioRendererBitmapProvider base class.
GCC warned that it was missing a virtual destructor while having virtual methods.

Originally committed to SVN as r3399.
2009-08-13 16:14:41 +00:00
Niels Martin Hansen f810fd20ce Rename audio_spectrum.* to audio_renderer_spectrum.* in preparation of converting the spectrum into a slave of AudioRenderer. See #951 and #990.
Originally committed to SVN as r3398.
2009-08-13 16:04:45 +00:00
Niels Martin Hansen 2a7e42c6a5 This should fix Mac builds failing on GL stuff.
Originally committed to SVN as r3396.
2009-08-13 00:35:45 +00:00
Niels Martin Hansen 09e27f5df3 Add two missing functions to audio_renderer.cpp to finally make it compile!
Originally committed to SVN as r3395.
2009-08-13 00:14:36 +00:00
Niels Martin Hansen 80364aaf01 Also forgot a wx include for wxMemoryDC in audio_renderer.cpp.
Originally committed to SVN as r3394.
2009-08-13 00:05:38 +00:00
Niels Martin Hansen 29f1272843 Uh oops, audio_renderer.cpp was including <set> instead of <map>...
Originally committed to SVN as r3393.
2009-08-13 00:04:16 +00:00
Niels Martin Hansen 5501c42cb0 Add (currently unused) AudioRendrer class and companions, see #951, #965 and #990.
Originally committed to SVN as r3390.
2009-08-12 23:42:53 +00:00
Niels Martin Hansen 0276b31225 Get rid of the unused and outdated changelog.txt.
Originally committed to SVN as r3389.
2009-08-11 18:21:58 +00:00
Amar Takhar f8963ff875 Update a bunch of icons from Kaverin and add the final two karaoke buttons.
Originally committed to SVN as r3388.
2009-08-11 17:01:02 +00:00