Commit graph

5537 commits

Author SHA1 Message Date
Thomas Goyne
518f93f18f Create the json log writer after checking for local config so it goes to the right place
Originally committed to SVN as r6249.
2012-01-08 01:36:35 +00:00
Thomas Goyne
e2d31b708e Split the json log writing into a seperate class from LogSink
Originally committed to SVN as r6248.
2012-01-08 01:36:23 +00:00
Thomas Goyne
59ce8bf414 Pass wxStrings to wxString::Format rather than std::string in LogWindow
Originally committed to SVN as r6247.
2012-01-08 01:36:16 +00:00
Thomas Goyne
d148bbbf2a Make agi::log::LogSink take ownership of the emitters passed to it
Originally committed to SVN as r6246.
2012-01-08 01:36:09 +00:00
Thomas Goyne
ba1a1dc737 Load configuration before initializing commands, hotkeys and icons, as hotkeys uses ?user which may be changed by configuration loading
Originally committed to SVN as r6245.
2012-01-08 01:36:03 +00:00
Thomas Goyne
d2d28401bd Change how local config mode works
Rather than loading both the local and user config files and saving to
the local directory if an option is set, simply try to load the local
config file, and if it exists switch to local mode and never even touch
the user file.

Originally committed to SVN as r6244.
2012-01-08 01:35:56 +00:00
Thomas Goyne
ae62cb75b4 Add missing uses of STD_STR when converting from wxString to std::string
Originally committed to SVN as r6243.
2012-01-08 01:35:49 +00:00
Thomas Goyne
56337beb11 Use OutputDebugStringW rather than OutputDebugStringA in the windows debug logging so that unicode actually works
Originally committed to SVN as r6242.
2012-01-08 01:35:43 +00:00
Thomas Goyne
976da6717e Change "windows specific" things in the preferences dialog to avisynth-specific
Originally committed to SVN as r6241.
2012-01-08 01:35:37 +00:00
Thomas Goyne
32abbde477 Pass a copy of the video filename to SetVideo in VideoContext::Reload so that it doesn't get cleared by Reset
Originally committed to SVN as r6240.
2012-01-08 01:35:31 +00:00
Thomas Goyne
6f7836c11e Paint keyframe markers on top of line markers so that they don't vanish when lines are scenetimed
Originally committed to SVN as r6239.
2012-01-08 01:35:25 +00:00
Thomas Goyne
58c7bbd78a Sort inactive markers so that lower_bound will actually work when lines are out of order or overlapping
Originally committed to SVN as r6238.
2012-01-08 01:35:18 +00:00
Thomas Goyne
c84275d6fa Snap to markers in the audio display on click in addition to on drag
Originally committed to SVN as r6237.
2012-01-08 01:35:11 +00:00
Thomas Goyne
4dcb6240d4 Move audio marker snapping logic from the audio display to the dialogue timing controller
Originally committed to SVN as r6236.
2012-01-08 01:35:04 +00:00
Thomas Goyne
1285584e89 Add ?local for the user's local config dir; use it for FFMS2 indexes
Originally committed to SVN as r6235.
2012-01-08 01:34:57 +00:00
Thomas Goyne
44bc249fe8 Don't suffix the configuration directory with the version on unix
Aegisub is not a library that needs to support having many versions
installed at once, and having multiple versions sharing a config
directory mostly works fine on Windows anyway.

Closes #1031.

Originally committed to SVN as r6234.
2012-01-08 01:34:49 +00:00
Thomas Goyne
43d4e785fb Cosmetics in standard_paths.cpp
Originally committed to SVN as r6233.
2012-01-08 01:34:43 +00:00
Thomas Goyne
01646d7cf4 Remove StandardPaths::DecodePathMaybeRelative, as it's been deprecated forever
Originally committed to SVN as r6232.
2012-01-08 01:34:37 +00:00
Thomas Goyne
15d49fb655 Revamp AssFile::AddLine and related functions to eliminate the statics and hopefully make it less brittle
Originally committed to SVN as r6231.
2012-01-08 01:34:30 +00:00
Thomas Goyne
f8b4dd3a61 Bump copyright year in about dialog to 2012
Originally committed to SVN as r6230.
2012-01-08 01:34:24 +00:00
Thomas Goyne
afca7e9732 Don't overwrite overridden menu text when hotkeys change
Originally committed to SVN as r6229.
2012-01-08 01:34:18 +00:00
Thomas Goyne
8511376da5 Make strings from the menu json translatable
Originally committed to SVN as r6228.
2012-01-08 01:34:12 +00:00
Thomas Goyne
4d7518e127 Make OpenStream and CloseStream pure virtual
Originally committed to SVN as r6227.
2012-01-08 01:34:06 +00:00
Thomas Goyne
2f38efede6 Remove pointless call to CloseStream in AudioPlayer's destructor (calling virtual functions in constructors/destructors calls the version from the current class, not the most derived type)
Originally committed to SVN as r6226.
2012-01-08 01:34:01 +00:00
Thomas Goyne
81a99ae27b Remove pointless duplicated member variable in OSSPlayer and document a few of the members
Originally committed to SVN as r6225.
2012-01-08 01:33:55 +00:00
Thomas Goyne
02fa5bee3e Add option to automatically open audio when opening video. Closes #1134.
Originally committed to SVN as r6224.
2012-01-08 01:33:47 +00:00
Thomas Goyne
df9c6b627f Improve audio open error reporting and remove a pile of unused stuff in AudioPlayer
Originally committed to SVN as r6223.
2012-01-08 01:33:39 +00:00
Thomas Goyne
a927672c27 Remove unused private variables in AudioProvider
Originally committed to SVN as r6222.
2012-01-08 01:33:33 +00:00
Thomas Goyne
4e06c198d0 Kill AssStyle::Get\SetMarginString, as it isn't really used for much of anything
Originally committed to SVN as r6221.
2012-01-08 01:33:26 +00:00
Thomas Goyne
8fdd5d987e Remove the encoding parameter from AssFile::SaveMemory, as it only supports utf-8, and simplify the implementation
Originally committed to SVN as r6220.
2012-01-08 01:33:19 +00:00
Thomas Goyne
c379e1e8e0 Prompt to save changes before creating new subtitles
Originally committed to SVN as r6218.
2012-01-08 01:05:57 +00:00
Thomas Goyne
dc58b3db40 Clean up SetThreadName a little
Originally committed to SVN as r6217.
2012-01-08 01:05:51 +00:00
Thomas Goyne
c0d8270815 Add shell script to regenerate the .pot file
Originally committed to SVN as r6216.
2012-01-08 01:05:45 +00:00
Thomas Goyne
2b07b3411f Fill in a few placeholder strings
Originally committed to SVN as r6215.
2012-01-08 01:05:39 +00:00
Thomas Goyne
dfafbc082d Delete unused command "subtitle/tags/show"
Originally committed to SVN as r6214.
2012-01-08 01:05:33 +00:00
Thomas Goyne
e8ba128fa8 Synchronize a bunch of similar but not quite identical strings. Closes #1081.
Originally committed to SVN as r6213.
2012-01-08 01:05:25 +00:00
Thomas Goyne
c847318ddb Mark command strings as translatable
Originally committed to SVN as r6212.
2012-01-08 01:05:19 +00:00
Thomas Goyne
3efdef2224 Tweak a few strings to make them easier to translate
Originally committed to SVN as r6211.
2012-01-08 01:05:13 +00:00
Thomas Goyne
eaa1001d7a Don't mark help button page names as translatable
Originally committed to SVN as r6210.
2012-01-08 01:05:07 +00:00
Thomas Goyne
e08fb25d15 Check for --enable-debug before wxWidgets as the wx m4 macros use the value of $enable_debug
Originally committed to SVN as r6209.
2012-01-08 01:05:01 +00:00
Thomas Goyne
25c1225ad1 Fix bug where on wxGTK the display mode would get set to "Subs Only" the first time the menus were opened after opening video or audio
Originally committed to SVN as r6208.
2012-01-08 01:04:55 +00:00
Thomas Goyne
89705b4f9c Add missing config.h include in preferences.cpp
Originally committed to SVN as r6207.
2012-01-08 01:04:50 +00:00
Thomas Goyne
4990d8255c Don't bother refcounting portaudio initializations as portaudio does that internally
Originally committed to SVN as r6206.
2012-01-08 01:04:44 +00:00
Thomas Goyne
0fd475031a Make default script resolution customizable
Originally committed to SVN as r6205.
2012-01-08 01:04:37 +00:00
Thomas Goyne
6b85782dc5 Fix signed/unsigned comparison warning on x64
Originally committed to SVN as r6204.
2012-01-08 01:04:29 +00:00
Thomas Goyne
71968aa4f3 Fix wxString::Format assertion failures in the stack walker
Originally committed to SVN as r6203.
2012-01-08 01:04:16 +00:00
Thomas Goyne
00b3fcf0b7 Remove incorrect overriding of the test project's intermediate and output directories
Originally committed to SVN as r6202.
2012-01-08 01:04:11 +00:00
Thomas Goyne
0113b33d66 Always build with -g and optionally strip the debugging symbols on install so that crash backtraces aren't completely meaningless
Originally committed to SVN as r6201.
2012-01-08 01:04:05 +00:00
Thomas Goyne
5702dd60a1 Add install-strip target to the makefile
Originally committed to SVN as r6200.
2012-01-08 01:03:59 +00:00
Thomas Goyne
3d906ded47 Remove precompiled headers on 'make clean' and add 'mostlyclean' target that does not touch them
Originally committed to SVN as r6199.
2012-01-08 01:03:53 +00:00