mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
6776 commits 10 branches 31 tags 48 MiB
Commit graph

2913 commits

Author SHA1 Message Date
Thomas Goyne
bdebf392e2 Fix ipairs on tables 2013-05-02 17:57:06 -07:00
Thomas Goyne
4662f34774 Use std::this_thread on Windows to avoid having to build boost.chrono 2013-05-02 09:25:18 -07:00
Thomas Goyne
b2f5a993d9 Actually define __ipairs on LuaAssFile 2013-05-01 21:21:07 -07:00
Thomas Goyne
995e0d85e9 Make pairs and ipairs call the appropriate metamethods when present 
As is done in Lua 5.2. This makes it possible to use ipairs on the
subtitles object.
 2013-05-01 21:21:07 -07:00
Thomas Goyne
a6f7375427 Add lua cflags for auto4_regex.cpp 2013-04-29 20:32:27 -07:00
Thomas Goyne
05baa4b0e4 Fix compilation with gcc 4.7 2013-04-29 20:24:33 -07:00
Thomas Goyne
380e5fd99f Use boost::thread in LibassSubtitlesProvider 
libstdc++ 4.7's std::thread is missing sleep_for.
 2013-04-29 20:18:29 -07:00
Thomas Goyne
3e299958bd Fix compilation with gcc 2013-04-29 18:21:55 -07:00
Thomas Goyne
bbd8bb0eab Fix compilation on platforms where int64_t == long 2013-04-24 20:04:35 -07:00
Thomas Goyne
13521a0c3e Default to only showing the maximum in the waveform view 2013-04-24 19:40:15 -07:00
Thomas Goyne
7820b2a6dc Restore the position of the audio zoom slider from the options correctly. Closes #1597. 2013-04-21 19:04:15 -07:00
Thomas Goyne
8cd1a0a9d4 Remove in-repo copy of lua 5.1 and use the submodule instead 2013-04-21 18:02:03 -07:00
Thomas Goyne
7d5a8a1b4c Fix x64 compilation on Windows 2013-04-20 07:58:58 -07:00
Thomas Goyne
f68cc1e584 Fix crash when opening kanji timer dialog. Closes #1585. 2013-04-16 20:21:06 -07:00
Thomas Goyne
d6fd2f016b Shuffle some stuff around in MicroDVDSubtitleFormat::ReadFile 2013-04-16 20:05:45 -07:00
Thomas Goyne
b743bb39b0 Report a more useful line number for bad lines in the TPP. Closes #1596. 2013-04-16 20:05:45 -07:00
Thomas Goyne
3c7527c2f7 Do a better job of picking a new active line after deleting lines 
Set it to the first line not part of the selection after the selection
begins if there are any, and the last line remaining in the file if not
(i.e. the last line before the selection).

Closes #1595.
 2013-04-16 20:05:44 -07:00
Thomas Goyne
4e7d6df6b2 Remove the use of wxRegex for case-insensitive filtering 2013-04-16 20:05:44 -07:00
Thomas Goyne
17170fc5fe Remove the charset detection from TextFileReader since it's never used 2013-04-16 20:05:44 -07:00
Thomas Goyne
8bdb7d32ad Drop support for non-UTF-8 lua scripts 2013-04-16 20:05:44 -07:00
Thomas Goyne
68662211a1 Make Lua 5.1 a required dependency 2013-04-16 20:05:43 -07:00
Thomas Goyne
c556a47509 Replace wxRegex bindings for lua with boost::regex bindings 
API is mostly unchanged other than the addition of a lot more flags.
Should be less buggy since it has an actual test suite, and generally
has a more powerful regex syntax with better support for Unicode.

The bindings are written in MoonScript. For now the compiled form is
store in the repo for convenince.
 2013-04-16 20:05:43 -07:00
Thomas Goyne
44188267d6 Extract some common helper methods to auto4_lua_utils.h 2013-04-09 20:14:53 -07:00
Thomas Goyne
e5c25fa066 Fix crash when clearing the contents of one of the Margin boxes 2013-04-07 11:36:10 -07:00
Thomas Goyne
d3cfa20db9 Fix unicode issues in the karaoke split/join bar 
Use ICU to split the text into characters rather than assuming that one
wchar_t == one character in some places, and one char == one character
in other places.
 2013-04-07 11:36:06 -07:00
Thomas Goyne
e89fb6eeb8 Improve the edit box tooltips 2013-04-07 08:43:56 -07:00
Thomas Goyne
51e17b4c38 Remove unused private member 2013-03-30 07:52:49 -07:00
Thomas Goyne
cb9c48d6af Strip Collisions lines on read 
Nothing supports them and malformed values crash VSFilter.

Closes #1583.
 2013-03-30 07:18:34 -07:00
Thomas Goyne
1598e81773 Remove the 'Collisions' setting from the properties dialog 
No renderers actually support it so there's really no reason for it to
be settable.
 2013-03-30 07:08:57 -07:00
Thomas Goyne
c1b99aba0e Select the contents of the find box when opening the search/replace dialog 2013-03-29 17:21:07 -07:00
Thomas Goyne
de68a1995d Fix crashes from unchecked uses of lua_tostring. Closes #1588. 2013-03-18 07:01:54 -07:00
Thomas Goyne
890379bb86 Fix compilation error in auto4_lua_scriptreader.cpp 2013-02-16 19:53:54 -08:00
Thomas Goyne
a9f83663e8 Revert "Return the ifstream from agi::io::Open by move" 
This reverts commit 1f5484fedb.

Move constructors for fstreams are not implemented yet in libstdc++.

Closes #1578.
 2013-02-16 19:47:31 -08:00
Thomas Goyne
84410f770b Fix loading subtitles from Matroska files without track names 2013-02-13 20:22:02 -08:00
Thomas Goyne
959be0a64a Handle partial characters at the end of the read buffer when loading Lua scripts. Closes #1576. 2013-02-12 15:52:00 -08:00
Thomas Goyne
1f5484fedb Return the ifstream from agi::io::Open by move 2013-02-12 15:51:59 -08:00
Thomas Goyne
d99647ba28 Fix crash when closing video while a frame request is pending 2013-02-08 21:05:57 -08:00
Thomas Goyne
e7306ae642 Release mouse capture from the visual tools when the zoom is changed 2013-02-08 20:37:43 -08:00
Thomas Goyne
e9a949954f Split ass drawings on spaces, not | 2013-02-08 20:29:39 -08:00
Thomas Goyne
1a8c88faea Actually decode strings in inline_string_decode 2013-02-08 20:27:38 -08:00
Thomas Goyne
4a4583a77d Fix path generation for saving screenshots 2013-02-08 09:53:34 -08:00
Thomas Goyne
d3606eac99 Don't complain about things in the autoload folder which aren't automation scripts 2013-02-07 16:02:44 -08:00
Thomas Goyne
a872fc50b8 Store ass attachments in the encoded form in memory 
This marginally increases memory use, but vastly speeds up pretty much
everything when a file has attachments (other than extracting the
attachments, but that's generally IO-bound anyway).
 2013-02-07 16:02:44 -08:00
Thomas Goyne
73217fd0e9 Move uuencoding logic to libaegisub and add tests 2013-02-07 16:02:44 -08:00
Thomas Goyne
be8790942a Change AssParameterClass to an enum class 2013-02-07 08:55:01 -08:00
Thomas Goyne
e115206998 Change VariableDataType to an enum class 2013-02-07 08:49:11 -08:00
Thomas Goyne
14afce006e Remove AssStyleStorage's dependencies on other Aegisub classes 2013-02-07 08:47:43 -08:00
Thomas Goyne
9a69017752 Don't drop the last two chaacters in inline_string_decode 2013-02-06 17:13:14 -08:00
Thomas Goyne
48921c35e0 Use ICU for checking if characters are whitespace 2013-02-06 13:38:35 -08:00
Thomas Goyne
9f2fdb2a86 Count characters rather than bytes in the character counter 2013-02-06 13:38:35 -08:00
Thomas Goyne
777649a551 Update the character count asynchronously 2013-02-06 13:38:35 -08:00
Thomas Goyne
40a7a452a2 Delay loading command line arguments until after Aegisub is fully initialized 2013-02-06 13:38:35 -08:00
Thomas Goyne
8118d790a4 Don't display an error message if user cancels the charset selection dialog 2013-02-06 13:38:35 -08:00
Thomas Goyne
3d48f18542 Display the full list of supported character sets if detection fails catastrophically 2013-02-06 13:38:34 -08:00
Thomas Goyne
1f831be170 Ask the user if they want to close the current file before prompting for a new file to open rather than after 2013-02-06 13:38:34 -08:00
Thomas Goyne
6cb9665202 Support extensions with multiple dots in agi::fs::HasExtension 2013-02-06 13:38:34 -08:00
Thomas Goyne
386f60daa7 Remove an unused private member from VideoDisplay 2013-02-06 13:38:34 -08:00
Thomas Goyne
841ec898d3 Add ICU to the configure script 2013-02-06 13:38:33 -08:00
Thomas Goyne
fd6f4a38e5 Remove unused private member in AudioMarkerInteractionObject 2013-02-06 13:38:33 -08:00
Thomas Goyne
5efba3fda1 Improve handling of whitespace in the fonts collector 
When whitespace characters are missing in the font, print the names of
the characters rather than seemingly printing nothing.

Closes #1553.
 2013-02-06 13:38:33 -08:00
Thomas Goyne
2a5134a5ca Add an option to not skip blank lines when importing plain text files 2013-02-06 13:38:33 -08:00
Thomas Goyne
d55949d9c1 Only perform charset detection once when opening subtitles 
Relying on TextFileReader to do the charset detection results in the
user being prompted to pick a charset twice when it can't be
auto-detected, since the result from trying to open the subtitles as
timecodes was not being reused.

Closes #1512.
 2013-02-06 13:38:33 -08:00
Thomas Goyne
47c36c9033 Use ICU/boost.locale for case-insensitive searching 
Do proper unicode case-folding for case-insensitive searching rather
than converting only ascii characters to lowercase. The Turkish 'i' is
still not handled correctly (since it's the only place where
case-folding is locale-dependent), but that's probably not worth caring
about as long as we don't have a Turkish UI translation.

This affects both the find/replace dialog and the select lines dialog.

Closes #1342.
 2013-02-06 13:38:33 -08:00
Thomas Goyne
09aa873ed7 Hide the StatusTimeout awfulness in a util function 2013-02-06 13:22:34 -08:00
Thomas Goyne
a9467836f9 Move autosave logic to SubsController 2013-02-06 13:22:34 -08:00
Thomas Goyne
396ff897e5 Kill StandardPaths 
It's now just a pointless wrapper around agi::Path.
 2013-02-06 13:22:33 -08:00
Thomas Goyne
9f7e865196 Set the default string encoding to UTF-8 2013-02-06 13:22:33 -08:00
Thomas Goyne
8846d77845 Use ICU regular expressions for user-entered regexps 2013-02-06 13:22:33 -08:00
Thomas Goyne
be930e68ef Use std::atomic rather than a mutex in the progress dialog 2013-02-06 13:22:32 -08:00
Thomas Goyne
bc5417de4a Give all of the Aegisub-created threads names 2013-02-06 13:22:32 -08:00
Thomas Goyne
a0d3dbc550 Extract Loading/Saving/Undo stuff from AssFile 
Add SubsController, which deals with things like what subtitle file is
currently open, rather than the contents of the current subtitle file.
Move the rest of the relevant logic from FrameMain there in addition to
all of the stuff from AssFile.
 2013-02-06 13:22:32 -08:00
Thomas Goyne
9a146d1fc0 Remove AssFile::loaded since it isn't actually used for anything 2013-02-06 13:22:17 -08:00
Thomas Goyne
5092ab20c9 Do logging on a background thread 
Makes logging actually thread-safe and slightly improves performance.
 2013-02-06 13:22:17 -08:00
Thomas Goyne
2e99223977 Factor out some duplicated code in the color picker slider generation 2013-02-06 13:22:16 -08:00
Thomas Goyne
2113ed9580 Use boost.gil for overlaying images from libass 2013-02-06 13:22:16 -08:00
Thomas Goyne
6bd6ed5e5b Remove support for saving to memory with CSRI since there aren't actually any non-VSFilter renderers 2013-02-06 13:22:16 -08:00
Thomas Goyne
a942687050 Use a circular buffer to store only the last 250 log messages 2013-02-06 13:22:16 -08:00
Thomas Goyne
c6005be4a1 Write log files incrementally so that they actually exist for crashes 2013-02-06 13:22:16 -08:00
Thomas Goyne
101721863a Make log messages a little saner 2013-02-06 13:22:16 -08:00
Thomas Goyne
ca9be4caef Extract some duplicated wxFileSelector code to a helper function 2013-02-06 13:22:16 -08:00
Thomas Goyne
bc7229782c Use an enum for the predefined aspect ratio types 2013-02-06 13:22:15 -08:00
Thomas Goyne
9537e14c3c Use boost.rational for AR normalization 2013-02-06 13:22:15 -08:00
Thomas Goyne
1e1a09e67a Use AssTime's formatting for DialogVideoDetails 2013-02-06 13:22:15 -08:00
Thomas Goyne
1e0f08c0ed Mostly purge wxWidgets from non-UI stuff 
Use boost::filesystem::path for all paths, and std::string for all other
strings, converting to/from wxString as close to the actual uses of wx
as possible.

Where possible, replace the uses of non-UI wxWidgets functionality with
the additions to the standard library in C++11, or the equivalents in
boost.

Move the path token management logic to libaegisub (and rewrite it in
the process).

Add a basic thread pool based on asio and std::thread to libaegisub.

This touches nearly every file in the project and a nontrivial amount of
code had to be rewritten entirely, so there's probably a lot of broken
stuff.
 2013-02-06 13:22:15 -08:00
Thomas Goyne
10e06ac3f9 Build and/or link the non-header-only boost libraries 2013-02-01 19:07:51 -08:00
Thomas Goyne
89a431a68b Set end times to zero when pasting plain text. Closes #1570. 2013-01-17 14:04:50 -08:00
Thomas Goyne
cbbcc35e4f Remove some pointless initializers in AssDialogue's constructor 2013-01-17 14:03:48 -08:00
Thomas Goyne
c08a9d4d7d Always make a full copy of the subtitles for ThreadedFrameSource after a save 
Saving can add new lines to the file without making a commit, resulting
in the rendering thread's copy of the file getting out of sync.
 2013-01-14 08:37:04 -08:00
Thomas Goyne
9a69ca9de4 Add padding between the split editbox buttons 2013-01-14 08:37:03 -08:00
Thomas Goyne
3499a0546a Make the split editor readonly rather than disabled 2013-01-14 08:37:03 -08:00
Thomas Goyne
879c2c19ae Add a button to the split editbox to remove the line text only, leaving override tags 2013-01-14 08:37:03 -08:00
Thomas Goyne
31d2054ab3 Don't update the initial line state after undo 2013-01-14 08:37:03 -08:00
Thomas Goyne
9a36e5cfe1 Add a unique ID to dialogue lines 
This is needed to track lines across undo, as the previous method of
using the row number was slow and broke on inserts/deletes.
 2013-01-14 08:37:03 -08:00
Thomas Goyne
0e7df15170 Initial implementation of the split editbox 2013-01-14 08:37:03 -08:00
Thomas Goyne
8162ebea24 Actually read the initial alpha for the color picker buttons 2013-01-14 08:37:03 -08:00
Thomas Goyne
abf592e705 Add support for parsing alpha override parameters 2013-01-14 08:37:03 -08:00
Thomas Goyne
948d3055d5 Eliminate some unnecessary includes of subs_grid.h 2013-01-14 08:37:03 -08:00
Thomas Goyne
8d3202652f Paste over the selected lines if the selection has multiple lines 
This seems to be what most users expect, rather than pasting downwards
from the active line, and is what pre-3.0 versions did as long as the
selection was continuous (since it pasted over from the first selected
line rather than the active line).
 2013-01-14 08:37:02 -08:00
Thomas Goyne
50baf2d97f Only add alpha tags if the user actually changes the alpha 2013-01-14 08:37:02 -08:00
Thomas Goyne
9e37e0897f Implement the "coloralpha" automation control type 2013-01-14 08:37:02 -08:00
Thomas Goyne
0b5674e6aa Hide the alpha controls when the alpha isn't used 2013-01-14 08:37:02 -08:00
Thomas Goyne
7a3b221847 Use wxStaticBitmap for ColorPickerRecent 2013-01-14 08:37:02 -08:00
Thomas Goyne
0e58e3b09f Inline the bodies of the color picker controls 
Scrolling between the declarations and definitions is annoying.
 2013-01-14 08:37:02 -08:00
Thomas Goyne
fa8fb65b8a Change PickerDirector to an enum class 2013-01-14 08:37:02 -08:00
Thomas Goyne
2072241e54 Move the implementation of the color picker dialog into an anonymous namespace 2013-01-14 08:37:01 -08:00
Thomas Goyne
247a92607b Remove the now-pointless convenience overload of GetColorFromUser 2013-01-14 08:37:01 -08:00
Thomas Goyne
4c147cbf0b Make ColourButton saner 
Emit a separate event for when a color is picked rather than horribly
overloading the onclick event, and switch to a wxButton base since
wxBitmapButton no longer does anything useful.
 2013-01-14 08:37:01 -08:00
Thomas Goyne
c37c1ad477 Add alpha support to the color picker. Closes #217. 2013-01-14 08:37:01 -08:00
Thomas Goyne
e19da4ffe7 Make the tag parameter parsing more forgiving of malformed input 2013-01-13 09:59:41 -08:00
Thomas Goyne
ed6c052e7f Use SearchReplaceEngine in DialogSelection 2013-01-13 09:00:19 -08:00
Thomas Goyne
6be8d32929 Clean up SearchReplaceEngine a bit 2013-01-13 09:00:19 -08:00
Thomas Goyne
f8b717e9ac Don't clear the body of \t tags when doing stuff to them 2013-01-13 09:00:18 -08:00
Thomas Goyne
3b4d121d4a Add an option to skip override tags when searching. Closes #104. 2013-01-13 09:00:18 -08:00
Thomas Goyne
5fff88473f Add option to skip comments in the find/replace dialog. Updates #683. 2013-01-13 09:00:18 -08:00
Thomas Goyne
ab3ef175cd Rewrite SearchReplaceEngine 
Decouple it from the subtitles grid and do everything through the
project context instead.

Actually obey the "In Selection" option for things other than Replace
All.

Cut down on the amount of logic duplicated between Replace All and
normal find/replace.

Start searching from the current cursor position, rather than the last
found position.
 2013-01-13 09:00:18 -08:00
Thomas Goyne
b1dbb9a94b Decouple SearchReplaceEngine from DialogSearchReplace 2013-01-13 09:00:18 -08:00
Thomas Goyne
59db22e905 Use STL names for wxString functions with a bunch of aliases 2013-01-11 08:55:35 -08:00
Thomas Goyne
2f4cae46b4 Move the SearchReplaceEngine instance to the context 2013-01-11 08:53:36 -08:00
Thomas Goyne
bc2ddfbaee Fix compilation with clang 2013-01-11 08:44:35 -08:00
Thomas Goyne
b337fbd691 Fix loading unicode actor names from plain text files 
'isComment ? "" : actor' results in actor decaying to a const char * in
the local charset rather than converting "" to wxString, which breaks
things when unicode is involved.
 2013-01-11 08:41:12 -08:00
Thomas Goyne
d459b7089c Use enums rather than magic numbers 2013-01-11 08:41:12 -08:00
Thomas Goyne
199507a58a Remove an unused variable and rename a misleading one 2013-01-11 08:41:12 -08:00
Thomas Goyne
c923b05c23 Eliminate some duplicated code in the find dialog 2013-01-11 08:41:12 -08:00
Thomas Goyne
2d521fafc5 Shuffle around the find dialog sizers to cut down on empty space 2013-01-11 08:33:52 -08:00
Thomas Goyne
13851ff74d Delete worthless comments 2013-01-11 08:33:52 -08:00
Thomas Goyne
4334514c78 Remove the "update video" box from the find dialog 
It hasn't worked for a few years and doesn't really make any sense with
how committing works now.
 2013-01-11 08:33:52 -08:00
Thomas Goyne
76d93f0036 Actually stretch the volume/zoom link button 2013-01-09 20:03:22 -08:00
Thomas Goyne
e9a5494910 Calculate the required size for the subs edit box time edits rather than hardcoding it 2013-01-09 19:44:26 -08:00
Thomas Goyne
d7d2e17093 Remove calls to SetBackgroundStyle(wxBG_STYLE_COLOUR) 
With wx2.9 it's a no-op.
 2013-01-09 19:40:49 -08:00
Thomas Goyne
ca80156a4d Add some padding between the video box textctrls 2013-01-09 19:38:41 -08:00
Thomas Goyne
cb1b5401e3 Remove the border around the video box in the detached video dialog 2013-01-09 19:26:39 -08:00
Thomas Goyne
442bbcc682 Add libass cflags to subtitles_provider.o 2013-01-09 19:24:47 -08:00
Thomas Goyne
8cb2d5bf16 Drop MPC-HC VSFilter and default to xy-VSFilter 2013-01-09 16:48:32 -08:00
Thomas Goyne
8566960312 Write the version comments under the [Script Info] header. Closes #1567. 2013-01-09 16:48:32 -08:00
Thomas Goyne
8470ffdbf0 Allow negative values for shadow depth, angle and spacing in the style editor 2013-01-09 16:48:32 -08:00
Thomas Goyne
7bc79b2d9f Significantly speed up AssDialogue::GetData 
wxString::Format is astonishingly slow, and while this normally doesn't
particularly matter, AssEntry::EntryData's speed can become relevant on
large files.

Switch to a slightly more manual approach that's about four times as
fast.
 2013-01-09 16:48:32 -08:00
Thomas Goyne
a99428c49d Extract options and MRU stuff from main.h 
Nearly all of the files including main.h are doing so only for OPT_GET
and friends, which are rather unrelated to the main things that main.h
declares.
 2013-01-09 16:48:31 -08:00
Thomas Goyne
bd9a81372d Cut down on the ifdefs in main.cpp 
Shuffle some stuff around to reduces the number of ifdefs and always
define MacOpenFile since there's no reason not to.
 2013-01-09 16:48:31 -08:00
Thomas Goyne
9b24ab38a4 Don't write the crash xml file 
Nothing uses it and it's not even valid xml.
 2013-01-09 16:48:31 -08:00
Thomas Goyne
c691099d24 Use CRC32 for ffms2 index filenames 
No real advantages other than that it means md5.h/c can be deleted.
 2013-01-09 16:48:30 -08:00
Thomas Goyne
4116e88fe5 Get rid of auto-running exporters, since they aren't really used for anything anymore 2013-01-03 17:36:50 -08:00
Thomas Goyne
7d6e246ace Handle filters which unregister themselves in AssExportFilterChain::Clear 2013-01-03 16:44:07 -08:00
Thomas Goyne
451de69e54 Trim whitespace from all of the style fields when parsing. Closes #1565. 2013-01-01 21:00:06 -08:00
Thomas Goyne
b1cd2db023 Don't throw exceptions from destructors 2013-01-01 20:55:00 -08:00
Thomas Goyne
faad79479f Handle FileNotFound errors when the user dictionary file doesn't exist 2012-12-31 07:50:17 -08:00
Thomas Goyne
3e5ba4fd98 Catch wxStrings in OnInit as there's still a few things that throw them 2012-12-31 07:49:57 -08:00
Thomas Goyne
8f765f3955 Add AssOverrideBlockComment 
Nothing actually wants to treat comments as plain text, so using the
same type for both just makes things more complex.
 2012-12-31 07:09:32 -08:00
Thomas Goyne
3ec82952f8 Partially de-wxify AssStyle 2012-12-31 07:09:31 -08:00
Thomas Goyne
d49758edbf De-wxify AssOverride 2012-12-31 07:09:31 -08:00
Thomas Goyne
426e4593c7 Fix a bunch of incorrect implicit wxString <-> std::string conversions 
The implicit conversion assumes that std::string is encoded in the local
charset, while it's always actually UTF-8.
 2012-12-31 07:09:31 -08:00
Thomas Goyne
2bf92fec6e Fix crash when amending commits with video open 
The video source's copy of the subtitle file was being discarded once it
was fully loaded (as it was previously never needed again), so amending
it only worked if the user had made a non-amend commit after the last
seek.
 2012-12-29 08:40:10 -08:00
Thomas Goyne
d5f36af87e Add override attributes to the subtitle formats 2012-12-28 19:49:48 -08:00
Thomas Goyne
43d3fac178 Fix compilation with libc++ 2012-12-28 09:44:53 -08:00
Thomas Goyne
b0cbc049ec Fix 64-bit compilation 2012-12-28 09:19:43 -08:00
Thomas Goyne
c6cd86f2da Actually initialize AssOverrideParameter::omitted 2012-12-28 09:18:54 -08:00
Thomas Goyne
87e60bca2a Fix fonts collector crash when the font isn't found 2012-12-28 07:32:55 -08:00
Thomas Goyne
9955a2c39d Log more stuff when creating audio providers 2012-12-27 08:49:37 -08:00
Thomas Goyne
572a58cd90 Have FFMS2 do the audio downmixing when possible 
Aegisub's downmixer is terrible for anything with more than two channels
(averaging all the channels together is not even vaguely close to the
correct thing to do for 5.1), so libavresample should be far better.
 2012-12-27 08:42:00 -08:00
Thomas Goyne
44323cef6d Use max_element rather than a loop 2012-12-26 19:27:25 -08:00
Thomas Goyne
6e3cc883b3 Replace most uses of type::iterator with auto 2012-12-22 15:35:13 -08:00
Thomas Goyne
d0f4d9df99 Replace all uses of lagi_wxString with to_wx 2012-12-22 15:18:38 -08:00
Thomas Goyne
e270dc9aec Use stable_vector for AudioProviderRam's cache 
stable_vector allocates its elements non-contiguously (as is required
for stability), while still giving O(1) indexing.
 2012-12-22 14:44:35 -08:00
Thomas Goyne
433368dc58 Fix some weirdness in the AVS audio provider 2012-12-22 12:14:32 -08:00
Thomas Goyne
46d2819312 Use lambdas for some of DialogProgress's stuff 2012-12-22 11:51:08 -08:00
Thomas Goyne
6e5b53d1a9 Move the logic for which AudioProvider to create out of AudioController 
Audio providers should be responsible for determining whether or not
they can open a URI, since it's not really possible for anything else
to. As such move the (lack of) parsing of dummy audio URIs to
DummyAudioProvider, and try to create DummyAudioProviders in
AudioProvider::CreateProvider.
 2012-12-22 09:30:47 -08:00
Thomas Goyne
a4607ff6be Clean up AudioProvider a bit 
Factor out some duplicated code and clean up some cruft.
 2012-12-22 07:49:59 -08:00
Thomas Goyne
31feab4a8b Rewrite the dummy video dialog 
Use validators for transferring data to/from the controls and for
validating the values rather than a bunch of custom logic.
 2012-12-21 17:01:13 -08:00
Thomas Goyne
0b5994e8eb Always update edit box styles when it's called directly 2012-12-21 16:56:27 -08:00
Thomas Goyne
e25fc4b334 Add Remove From Dictionary to the subs edit box context menu when applicable. Closes #1184. 2012-12-21 16:56:27 -08:00
Thomas Goyne
24aef1ffef Fix word-boundary checking for edit box spellchecking 2012-12-21 16:56:27 -08:00
Thomas Goyne
835f7c0f78 Only enable the Remove Word button when the word can be removed. Updates #1184. 2012-12-21 16:56:26 -08:00
Stjepan Henc
fe630e052b Add Remove Word button to the spellchecker dialog. Updates #1184. 2012-12-21 16:56:26 -08:00
Thomas Goyne
a2c14e9c5f Check the error code when FFMS2 can't create an indexer 
Creating an indexer can fail for reasons other than the file not
existing. This check is still not completely correct, since FFMS2 uses
the wrong error codes in a bunch of places.
 2012-12-17 10:14:08 -08:00
Thomas Goyne
4c6be1fe55 Fix y4m loading 2012-12-17 09:32:42 -08:00
Thomas Goyne
229e5d98c5 Avoid making a full copy of the file for ThreadedFrameSource when possible 
When the set of changed lines is populated, only copy those lines rather
than the entire file. On large files, this makes amend commits roughly
twice as fast when video is open.
 2012-12-17 09:32:42 -08:00
Thomas Goyne
fee60be5db Announce the set of lines changed in commits 
Currently this is only populated when commits are amended, for the
simple reason that it's the only time that AssFile knows what lines
changed. It is probably worth expanding this in the future.
 2012-12-17 09:32:42 -08:00
Thomas Goyne
4e72fff1d9 Check the right substrings in the spellchecker dialog. Closes #1560. 2012-12-12 18:08:07 -08:00
Thomas Goyne
72ae116196 Rename SubsEditBox's private members 
Mostly to cut down on conflicts with the split-editbox branch.
 2012-12-12 15:17:21 -08:00
Thomas Goyne
090905056b Remove spaces in > > in nested templates 2012-12-11 10:58:28 -08:00
Thomas Goyne
6e153ed7d9 Make OpenGLTextTexture moveable so that it doesn't need to be in a shared_ptr 2012-12-11 10:41:20 -08:00
Thomas Goyne
0b133de08f Remove pointless empty destructors 
An explicit empty destructor is only needed when a class has a smart
pointer to an incomplete type.
 2012-12-11 09:06:21 -08:00
Thomas Goyne
9a77d564e4 Cut down on the padding under the audio toolbar 2012-12-11 08:32:58 -08:00
Thomas Goyne
7c477f3cd1 Use a real toolbar for the video box's buttons 2012-12-11 08:25:24 -08:00
Thomas Goyne
534f574a87 Delete AssDialogue::StripTag 
It is not actually used anywhere.
 2012-12-10 17:43:29 -08:00
Thomas Goyne
8c2062f0c7 Store AssOverrideTags directly rather than a vector of pointers 2012-12-10 17:04:18 -08:00
Thomas Goyne
a0d3b8595f Redesign AssOverrideParameter 
Always store the original string form and convert it to the desired type
on demand. In most cases this is significantly faster as typically only
a few of the parameters in a line are actually read. In addition, this
makes it so that parameters which did not actually change are always
reserialized in their original form.

Delete VariableData as it's no longer used by anything.

Closes #1513.
 2012-12-10 14:41:11 -08:00
Thomas Goyne
f28f6ad5b3 Join lines copied to the clipboard with newlines rather than nothing 2012-12-10 14:03:03 -08:00
Thomas Goyne
681de8cf37 Fix order of VariableData's initializers 2012-12-09 17:19:01 -08:00
Thomas Goyne
a36011a9dd Don't insert [Script Info] entries for empty values 2012-12-09 17:07:05 -08:00
Thomas Goyne
c1409b5c25 Add a space after the colon in [Script Info] entries 2012-12-09 17:05:11 -08:00
Thomas Goyne
96b3656742 Stick to the standard order of sections when inserting lines 2012-12-09 15:44:03 -08:00
Thomas Goyne
205d408f3e Move tag/param proto declarations to the cpp file 
It's purely an implementation detail of the parser that should not be
exposed to the outside world.
 2012-12-09 15:40:29 -08:00
Thomas Goyne
8cf47c38b6 Drop AssOverrideParameter::omitted since it's equivalent to the type being VARDATA_NONE 2012-12-09 10:36:13 -08:00
Thomas Goyne
d2a0a76ca9 Store AssOverrideParameters directly rather than a vector of pointers to them 2012-12-09 10:12:50 -08:00
Thomas Goyne
851f7f40e6 Make VariableData uncopyable but moveable 2012-12-09 10:12:50 -08:00
Thomas Goyne
482d31299b Remove unused things from VariableData 2012-12-09 08:04:29 -08:00
Thomas Goyne
7e38ad6ec7 Don't add {} to the body of \t tags 2012-12-09 08:04:20 -08:00
Thomas Goyne
bd35d9308d Use unordered_set for the actor/effect values 2012-12-07 19:24:42 -08:00
Thomas Goyne
9b44f92235 Make AssEntry purely a base class and add AssInfo 
Now that all the other junk is being dropped from the file, script info
lines are the only thing left which was a concrete AssEntry, and
AssEntry wasn't actually a very good way to store them.
 2012-12-07 18:55:29 -08:00
Thomas Goyne
28705000bb Use boost::join in a handful of places 2012-12-07 08:25:47 -08:00
Thomas Goyne
0ac8df140c Make the check for if an override tag needs parens less dumb 2012-12-07 08:12:45 -08:00
Thomas Goyne
422cfb153f Add a box with the character count of the longest line 
Character counts are a pretty terrible measure of anything, but it's
still the main measure of length used in most subtitling standards
(because subtitling standards are written under the assumption that the
tools are terrible (which is generally an accurate assumption)).
 2012-12-06 10:01:47 -08:00
Thomas Goyne
1b15a753a1 Add .m4v to the list of video file extensions 
It would be nice if this didn't require adding it in five different places...
 2012-12-05 20:23:32 -08:00
Thomas Goyne
222c09b58f Increase maximum undo levels to 10000 from 100 2012-12-05 19:12:34 -08:00
Thomas Goyne
d5aae26d83 Use boost::flyweight to intern the wxString members of AssDialogue 
100 no-op non-amend commits on a subtitle file with 6689 dialogue lines,
with the undo limit set to 100:

Without flyweight:
	No video open:
		Initial memory usage: 30.6 MB
		Final memory usage: 498.0 MB
		Elapsed time: 6.3 seconds
	Video open, using libass:
		Initial memory usage: 54.3 MB
		Final memory usage: 653.3 MB
		Elapsed time: 23.7 seconds

With flyweight:
	No video open:
		Initial memory usage: 26.0 MB
		Final memory usage: 104.5 MB
		Elapsed time: 3.0 seconds
	Video open, using libass:
		Initial memory usage: 46.7 MB
		Final memory usage: 251.8 MB
		Elapsed time: 13.0 seconds

No video open:
	Memory usage: -79%
	Time: -52%
Video open:
	Memory usage: -61.5%
	Time: -45%

100 no-op amend commits on a line in the middle of a subtitle file with
6689 dialogue lines, with video open:

Without flyweight:
	Initial memory usage: 48.2 MB
	Final memory usage: 182.3 MB
	Elapsed time: 22.3 seconds

With flyweight:
	Initial memory usage: 39.8 MB
	Final memory usage: 165.8 MB
	Elapsed time: 13.8 seconds

Note: The large jump in memory usage here is due to that the benchmark
is blocking the main thread, so at the end there are ~100 video frames
waiting to be displayed.
 2012-12-05 18:43:44 -08:00
Thomas Goyne
c7c270cf12 Use an enum for the SRT parser states 2012-12-05 15:06:02 -08:00
Thomas Goyne
c1ed667025 Add the curly braces in AssDialogueBlockOverride::GetText 
All of the calling code added them, so there's no reason not to just do
it in one place.
 2012-12-04 19:49:05 -08:00
Thomas Goyne
17ffacb6a0 Use iota rather than partial sum 2012-12-02 13:34:32 -08:00
Thomas Goyne
de4ef14598 Use lambdas for very short event handlers 2012-12-02 13:29:46 -08:00
Thomas Goyne
91fa11e375 Relicense all of my stuff that's still 3-BSD to ISC 2012-12-02 13:14:24 -08:00
Thomas Goyne
009518271a Document a few things and kill all remaining placeholders 2012-12-02 13:08:42 -08:00
Thomas Goyne
3949ccec24 Drop the position argument from ProcessParametersCallback since nothing needs it 2012-12-02 12:39:37 -08:00
Thomas Goyne
1c176e8568 Store parsed dialogue blocks in a ptr_vector 
This eliminates the need to explicitly delete the parsed blocks.

Also go ahead and remove AssDialogue::Blocks since it's really not a
very good idea in general.
 2012-12-02 12:29:33 -08:00
Thomas Goyne
67d796731a Replace SubsEditBox::OnUndoTimer with a lambda 2012-12-02 07:59:32 -08:00
Thomas Goyne
b507f49cec Remove the pad argument from GetMarginString 
It's no longer ever actually set to true.
 2012-12-02 07:59:31 -08:00
Thomas Goyne
3045e2d012 Move the Margin controls to an array 2012-12-02 07:59:31 -08:00
Thomas Goyne
fae9a5496a Extract some duplicated code for the margin controls 2012-12-02 07:59:31 -08:00
Thomas Goyne
0b46fdff49 Refactor time ctrl handling in SubsEditBox 2012-12-02 07:59:31 -08:00
Thomas Goyne
1b6f122d12 Replace field_setter with a lambda 2012-12-02 07:59:31 -08:00
Thomas Goyne
d3fc4dcb25 Remove things used in one (or zero) files from agi_pre.h 2012-12-02 06:33:30 -08:00
Thomas Goyne
7090d2f513 Don't include wx/wx.h in subs_grid.h 2012-12-02 06:33:29 -08:00
Thomas Goyne
96cf5ea7ed Kill the #ifndef AGI_PRE guards 
They don't actually improve compilation performance and make it more
annoying to modify what things are in the precompiled header.
 2012-12-02 06:33:29 -08:00
Thomas Goyne
ff03fef2db Use the C++ versions of C headers 2012-12-01 17:24:59 -08:00
Thomas Goyne
f337db86d3 Make AssStyle::UpdateData and GetSSAText less weird 2012-12-01 17:24:59 -08:00
Thomas Goyne
56993f7f5e Don't use emplace_back for wxDataViewItemArray since it doesn't work in non-STL builds 2012-11-30 18:47:24 -08:00
Thomas Goyne
e0ce2962cf Fix typo in a VFW error message 2012-11-30 17:06:01 -08:00
Thomas Goyne
c2a43a2356 Clean up AssKaraoke a little bit 2012-11-30 16:40:00 -08:00
Thomas Goyne
ffef9a1485 Round syllable durations to centiseconds when splitting syllables 2012-11-30 16:25:20 -08:00
Thomas Goyne
af35e50810 Also move karaoke markers after the dragged marker if Ctrl is held down. Closes #1557. 2012-11-30 16:22:45 -08:00
Thomas Goyne
66becbab16 Fix crash on exit 
Subtitle formats unregister themselves when deleted, so using
delete_clear on the list of subtitle formats does not work very well.
 2012-11-30 12:01:44 -08:00
Thomas Goyne
5513d774bf Rewrite the fontconfig font lister 
FcFontRenderPrepare discards excess family names and fullnames, so in
some cases it may be impossible to verify that the font returned by it
is the one we asked for. To work around this, prefilter the available
fonts to only do fontconfig's matching on the ones with the correct
names.
 2012-11-30 12:01:44 -08:00
Thomas Goyne
0b19908e7b Use std::prev and std::next where applicable 2012-11-30 10:54:57 -08:00
Thomas Goyne
174a992974 Use remove_and_dispose_if where applicable 2012-11-30 10:44:09 -08:00
Thomas Goyne
6ab8345148 Use nullptr in more places 2012-11-30 10:44:09 -08:00
Thomas Goyne
7a7a036017 Switch lists of pointers to vectors of pointers 2012-11-30 10:44:09 -08:00
Thomas Goyne
e77e810bd8 Use emplace_back where applicable 2012-11-30 10:44:09 -08:00
Thomas Goyne
eca70285f1 Switch all uses of std::list for signal connections to std::deque 2012-11-28 07:28:18 -08:00
Thomas Goyne
42a8a55b51 Fix setting hotkeys 
Populating a vector by resizing it to the target size then using
push_back does not work very well.
 2012-11-27 16:14:06 -08:00
Thomas Goyne
d7b01edc64 Support styles after the dialogue in the fonts collector 
Make two passes over the file to collect all of the styles before
processing the dialogue lines, as the styles section can legally come
after the dialogue lines which use those styles.
 2012-11-26 16:37:53 -08:00
Thomas Goyne
a5ac77368c Use EVT_CHAR_HOOK rather than EVT_KEY_DOWN in TimeEdit 
With wxWidgets trunk keydown events are no longer generated for
Ctrl-C/X/V on Windows, which breaks the custom copy/paste handling.
 2012-11-26 07:38:50 -08:00
Thomas Goyne
5309f7fb9d Add explicit override specifiers to ASS-related virtuals 2012-11-26 07:11:30 -08:00
Thomas Goyne
2a6c6616a9 Rename AssStyle::GetType() to AssStyle::Group() so that it actually gets called 2012-11-26 07:11:30 -08:00
Thomas Goyne
1a6caa27b6 Switch to using lambdas in a few places 2012-11-26 07:11:30 -08:00
Thomas Goyne
2c1f593a13 Delete declarations of LuaParseTagData and LuaUnparseTagData 2012-11-26 07:11:30 -08:00
Thomas Goyne
6b09bdfe70 Factor out some duplicated code 2012-11-26 07:11:30 -08:00
Thomas Goyne
947dc537d1 Add a generic function for invoking functions on the GUI thread 2012-11-26 07:11:30 -08:00
Thomas Goyne
1d020b851e Add picked colors to the recently used colors 2012-11-25 16:47:39 -08:00
Thomas Goyne
59e6a1bef7 Fix crash when playing audio before time 0 
There were two checks for reads past the end rather than checks for
before start and after end.

Closes #1556.
 2012-11-25 14:01:50 -08:00
Thomas Goyne
4e8e5b597c Change AssEntry::group to an enum 2012-11-25 14:01:50 -08:00
Thomas Goyne
49ed0551ad Consolidate all entries of each group when there are duplicate sections 
Dealing with multiple instances of each section makes the code
significantly more complicated, and in most cases Aegisub doesn't
actually bother to handle it correctly.
 2012-11-24 16:24:01 -08:00