Commit Graph

4889 Commits

Author SHA1 Message Date
Thomas Goyne e49486201d Eliminate the duplication between VideoContext::videoName and VideoContext::videoFile
Originally committed to SVN as r5969.
2011-12-06 00:17:54 +00:00
Thomas Goyne 2fa16a78c6 Move snapshot saving from VideoContext to the commands
Originally committed to SVN as r5968.
2011-12-06 00:17:45 +00:00
Thomas Goyne 8a7f4038c1 Make the video provider owned solely by ThreadedFrameSource rather than in a shared_ptr stored in several places
Originally committed to SVN as r5967.
2011-12-06 00:17:36 +00:00
Thomas Goyne 59fdab5fe7 Remove VideoContext::nextFrame as it's unused
Originally committed to SVN as r5966.
2011-12-06 00:17:25 +00:00
Thomas Goyne c26e61f209 Remove the audio resync code from VideoContext. It didn't actually work with the threaded video provider and should be unneccesary as video now always plays back at full speed (dropping frames if needed).
Originally committed to SVN as r5965.
2011-12-05 05:27:05 +00:00
Thomas Goyne 8ab9ba77ae Remove the prohibition against seeking while video is playing and just do Stop; Seek; Play as the slider already did in some cases
Originally committed to SVN as r5964.
2011-12-05 05:26:58 +00:00
Thomas Goyne f95f1f13cf Don't block key events on the video slider when video is playing, as this makes stopping the video rather awkward and it's unneccesary
Originally committed to SVN as r5963.
2011-12-05 05:26:52 +00:00
Thomas Goyne 2e40652265 Simplify video playback logic
Originally committed to SVN as r5962.
2011-12-05 05:26:45 +00:00
Thomas Goyne 1f534bc757 Kill VideoContext::playMutex. I assume it was a relic from the old threaded video display code as it's completely pointless.
Originally committed to SVN as r5961.
2011-12-05 05:26:38 +00:00
Thomas Goyne 73ee949d55 Fix bounds checking in the rectangular clip visual tool with detached video
Originally committed to SVN as r5960.
2011-12-05 03:22:33 +00:00
Thomas Goyne 009d99407b Force a relayout of the video display after switching visual tools. Fixes a bug where the subtoolbar would sometimes appear in the wrong place.
Originally committed to SVN as r5959.
2011-12-05 01:45:08 +00:00
Thomas Goyne 48d412468e Make the log dialog not insane and crashy
Originally committed to SVN as r5958.
2011-12-02 04:36:06 +00:00
Thomas Goyne 95a329a1e2 Flush the clipboard on exit so that it isn't cleared
Originally committed to SVN as r5957.
2011-12-02 04:35:59 +00:00
Thomas Goyne 59ddcab360 Add Ctrl-Shift-S as a default hotkey for Save As
Originally committed to SVN as r5956.
2011-12-01 21:59:35 +00:00
Thomas Goyne df3d3cd409 Fix assertion failure when opening the Jump To dialog on 64-bit linux
Originally committed to SVN as r5955.
2011-12-01 04:22:55 +00:00
Thomas Goyne d6ba00883e Fix infinite loop when opening video with wxgtk
Originally committed to SVN as r5954.
2011-12-01 03:47:19 +00:00
Thomas Goyne 90582c0b15 Use NumValidator to ensure only numbers are typed in the frames box of the jump to dialog. Updates #1319.
Originally committed to SVN as r5953.
2011-12-01 00:43:48 +00:00
Thomas Goyne 157c03ce63 Load the colors for the audio display timeline from the audio colorscheme
Originally committed to SVN as r5952.
2011-11-30 21:04:46 +00:00
Thomas Goyne 7bfdc78b72 Load the colors for the audio display scrollbar from the audio colorscheme
Originally committed to SVN as r5951.
2011-11-30 21:04:37 +00:00
Thomas Goyne fa15f0800e Make audio color schemes selectable in the preferences dialog
Originally committed to SVN as r5950.
2011-11-30 21:04:28 +00:00
Thomas Goyne 1a4d116617 Add green audio color scheme similar to the default waveform colors in 2.1. Currently only actually usable by manually editing the config file.
Originally committed to SVN as r5949.
2011-11-30 21:04:18 +00:00
Thomas Goyne 9cb7b23345 Get color scheme names from the config rather than hardcoding it
Originally committed to SVN as r5948.
2011-11-30 21:04:09 +00:00
Thomas Goyne 598a85c6cd Move color scheme definitions to the config file
Originally committed to SVN as r5947.
2011-11-30 21:03:57 +00:00
Thomas Goyne f0e98151f1 Close audio if an error occurs while announcing the opened audio as the program is probably in an inconsistent state
Originally committed to SVN as r5946.
2011-11-30 04:28:03 +00:00
Thomas Goyne b4d2bba7a2 Fix the name of the Resample Resolution dialog's help page
Originally committed to SVN as r5945.
2011-11-30 03:46:44 +00:00
Thomas Goyne adb5963fbd Cast size_ts used in format strings to ints instead as there isn't actually a portable way to format them.
Originally committed to SVN as r5944.
2011-11-30 02:44:27 +00:00
Thomas Goyne f9e8175cb8 Fix wxString::Format assertion failures in 64-bit builds
Originally committed to SVN as r5943.
2011-11-30 02:38:42 +00:00
Thomas Goyne a47f51080c Also define __STDC_FORMAT_MACROS for commands
Originally committed to SVN as r5942.
2011-11-30 02:16:01 +00:00
Thomas Goyne 9203f17f4d Implement the Lock Scroll on Cursor option in the audio display
Originally committed to SVN as r5941.
2011-11-30 00:40:32 +00:00
Thomas Goyne c6b97612ae Delay creation of the audio renderer until audio is actually opened
Originally committed to SVN as r5940.
2011-11-30 00:40:22 +00:00
Thomas Goyne 8632d5ce75 Remove some unreachable code in SubtitleFormat::AskForFPS
Originally committed to SVN as r5939.
2011-11-29 23:26:31 +00:00
Thomas Goyne 500b8b66d8 Make a few of FrameMain's members local to InitContents
Originally committed to SVN as r5938.
2011-11-29 23:18:42 +00:00
Thomas Goyne dfc68a4db9 Make the int/double option type detection slightly less broken
Choosing between int and double based on whether the default value is an
int is dumb and broken enough, but with the "ceil" the detection didn't
even work for negative numbers.

Originally committed to SVN as r5937.
2011-11-29 23:18:34 +00:00
Thomas Goyne b993c02dee Move AegisubFileDropTarget to frame_main.cpp. It's under ten lines of code so there's really no point in having two separate files for it.
Originally committed to SVN as r5936.
2011-11-29 23:18:24 +00:00
Thomas Goyne bad20c2898 Delete aegisub/src/command/header
Originally committed to SVN as r5935.
2011-11-29 23:18:15 +00:00
Thomas Goyne 1374813ee7 Update out-of-date messages about audio players in the configure script
Originally committed to SVN as r5934.
2011-11-29 23:18:07 +00:00
Thomas Goyne eaba8eb177 Define __STDC_FORMAT_MACROS for all files in the Makefile and vc10 project, as was already done in the vc9 project. There's a decent number of files which need it and we don't have any naming conflicts with it so there's no reason not to.
Originally committed to SVN as r5933.
2011-11-29 23:17:58 +00:00
Thomas Goyne 0e260409fd Remove unused OnKeyDown method from DialogSearchReplace
Originally committed to SVN as r5932.
2011-11-29 23:17:49 +00:00
Thomas Goyne 19503ef4f8 Simplify HelpButton and add some error handling
Originally committed to SVN as r5931.
2011-11-29 23:17:40 +00:00
Thomas Goyne 3f90614fd0 Delete static_bmp.[h|cpp] as it isn't actually used anywhere
Originally committed to SVN as r5930.
2011-11-29 23:17:31 +00:00
Thomas Goyne a445512970 Remove out-of-date comment in auto4_lua.cpp
Originally committed to SVN as r5929.
2011-11-29 23:17:20 +00:00
Thomas Goyne d061e81ada Disable LTCG in debug builds
Originally committed to SVN as r5928.
2011-11-28 23:57:33 +00:00
Thomas Goyne 371bda4f2b Move standard windows libraries from setup.cpp to the project. Updates #949.
Originally committed to SVN as r5927.
2011-11-28 22:45:27 +00:00
Thomas Goyne 7e1ef51b8e Remove wx libraries from setup.cpp. Updates #949.
Originally committed to SVN as r5926.
2011-11-28 22:45:16 +00:00
Thomas Goyne 66f3a3ce55 Fix integer overflow in the matroska subtitle loader which resulted in meaningless progress reporting
Originally committed to SVN as r5925.
2011-11-28 22:16:58 +00:00
Thomas Goyne cce9cb3c47 Fix unintended lowercasing of all strings returned from AssFile::GetScriptInfo
Originally committed to SVN as r5924.
2011-11-28 22:16:50 +00:00
Thomas Goyne cdf05af92b Refactor out a bunch of duplicated code in DialogProperties
Originally committed to SVN as r5923.
2011-11-28 22:16:41 +00:00
Thomas Goyne 303432a671 Default to zero when the initial value for a NumValidator is ""
Originally committed to SVN as r5922.
2011-11-28 22:16:33 +00:00
Thomas Goyne ca91097b8f Revamp script resolution setting logic
Rather than setting the default script resolution to 640x480, leave it
unset in new files. When video is opened, if the user has not already
manually set a script resolution, automatically use the video's
resolution as the script resolution. If the user has and the set
resolution is not a multiple of the video resolution, use the old prompt
for updating it.

This eliminates the confusing prompt about mismatched resolutions when
opening video with a new file while hopefully resulting in users using
the correct resolution more often.

Originally committed to SVN as r5921.
2011-11-28 22:16:22 +00:00
Thomas Goyne f519a493c8 Increment PortAudio refcount even if it's currently initialized
Originally committed to SVN as r5920.
2011-11-28 20:02:07 +00:00