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

2728 commits

Author SHA1 Message Date
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
Thomas Goyne
b94547aa71 Drop format and header lines from the in-memory file representation 
They're just pointless cruft, so drop them from the file when parsing
and re-add them when saving as ASS or SSA.
 2012-11-24 16:24:00 -08:00
Thomas Goyne
30ceced39f Skip the current line when searching for the next matching line in the kanji timer 2012-11-24 16:24:00 -08:00
Thomas Goyne
bdf7a0ca83 Parse unclosed override blocks as plain text as VSFilter does 2012-11-24 10:04:53 -08:00
Thomas Goyne
a4311b50f7 Update the correct inputs when typing in the HTML box in the color picker 2012-11-24 10:04:53 -08:00
Thomas Goyne
ded55272a0 Use the correct format for ASS colors in the color picker 2012-11-24 10:04:53 -08:00
Martin Herkt
b1e40455ed ASS: Fix script header 
Previously, Aegisub wrote its "Script generated by" lines without a
semicolon to mark them as comments. As a result, it prepended these
lines every time a script was loaded and then saved again. Fix.

Also fix a bug that caused the ASS parser to treat comments before
the [Script Info] section as non-blank lines, therefore inserting a
duplicate section header whenever such comments were present.
 2012-11-22 07:50:14 -08:00
Thomas Goyne
3f840ceec8 Fix crash when rearranging styles in the style manager 
Inserting lines already in an intrusive list at a different position
does not work, unlike with unintrusive lists. Instead, swap each item in
to the correct place.
 2012-11-21 07:32:06 -08:00
Thomas Goyne
8e10d67d2f Read strings from Matroska as UTF-8 
Strings in Matroska files are all either UTF-8 or a UTF-8 subset, not
whatever the current locale happens to be.
 2012-11-21 06:27:27 -08:00
Thomas Goyne
bd259b7197 Fix awesome variable shadowing derp 2012-11-20 14:28:57 -08:00
Thomas Goyne
b8b9bfdfb6 Fix non-pch compilation 2012-11-18 21:10:36 -08:00
Thomas Goyne
291e411f4c Use a patched zconf.h that doesn't try to include unistd.h when it isn't available 2012-11-17 11:13:08 -08:00
Thomas Goyne
b6c2cf887f Add an empty unistd.h for zconf.h 2012-11-16 15:58:56 -08:00
Thomas Goyne
b055abae44 Fix compliation with gcc 4.7 2012-11-15 18:15:40 -08:00
Thomas Goyne
89fef06d6b Replace all uses of auto_ptr with unique_ptr 2012-11-15 18:15:39 -08:00
Thomas Goyne
06aaaff16b NULL -> nullptr 2012-11-13 08:51:01 -08:00
Thomas Goyne
47c678bd63 Make UCDetect a little less insane 2012-11-13 08:46:31 -08:00
Thomas Goyne
653aa32eb2 Use std::any_of rather than std::find_if() != end() 2012-11-13 05:52:24 -08:00
Thomas Goyne
b6b68b789d Use lambdas in a few places 2012-11-12 19:40:42 -08:00
Thomas Goyne
6212afb314 Add karaoke templater support to the syntax highlighter 2012-11-12 18:35:27 -08:00
Thomas Goyne
c1dc875a05 Always add the spellchecker language list to the edit box context menu 
There's really no reason not to include it even if the right-click
wasn't on a word, and leaving it out can lead to confusing situations
when the dictionary file for the user's currently selected language
doesn't exist.
 2012-11-12 18:35:26 -08:00
Thomas Goyne
01c833d9b3 Make the autosave dialog resizeable 2012-11-12 18:35:26 -08:00
Thomas Goyne
c41f2ff343 Add an icon to the autosave dialog 2012-11-12 18:35:26 -08:00
Thomas Goyne
59a165f022 Change the crash recovery naming scheme to be like the autosave files 2012-11-12 18:35:26 -08:00
Thomas Goyne
eb823e66d3 Add backups and crash recovery files to the autosave dialog. Closes #657. 2012-11-12 18:35:26 -08:00
Thomas Goyne
154f831c7c Add a basic dialog for opening Autosave files 
This currently consists of just a list of autosave files and the
timestamps of the versions available for each file. It'd probably be a
good idea to add more information to this later, such as the original
file path and perhaps a preview of the file?

Closes #781.
 2012-11-12 18:35:26 -08:00
Thomas Goyne
88fdee726b Extract word-splitting logic from the syntax highlighter 2012-11-12 18:35:25 -08:00
Thomas Goyne
24c21dd425 Don't update the editbox styling when it hasn't changed 
The syntax highlighting isn't especially slow, but the stylesneeded
event seems to be sent repeatedly until the styles aren't changed, so it
was pointlessly reparsing and restyling the text on every idle event.
 2012-11-12 18:35:25 -08:00
Thomas Goyne
7a116db07d Unbind shift-enter in the edit box since it does weird things 2012-11-12 18:35:25 -08:00
Thomas Goyne
238356406f Extract calltip logic from the edit ctrl to libaegisub 2012-11-12 18:35:25 -08:00
Thomas Goyne
e4d6b8661b Add range adaptor for filtering to a specific subclass from a heterogeneous range 
This makes looping over the subtitle file and parsed dialogue lines less
awkward in many cases.
 2012-11-12 18:35:25 -08:00
Thomas Goyne
67df64e879 Use range-based for loops in a bunch of places 2012-11-12 18:35:25 -08:00
Thomas Goyne
5db559265f Drop support for config_windows.h 2012-11-12 18:35:23 -08:00
Thomas Goyne
1531ef88bd Visual Studio 2012 compilation fixes 
VS11 only defines pseudo-variadic template stuff for up to 5 arguments,
so use lambdas rather than bind.
 2012-11-12 18:35:23 -08:00
Thomas Goyne
1848aad5c1 Fix compilation with C++ 11/libc++ 2012-11-12 18:35:21 -08:00
Thomas Goyne
ebd56f2163 Include cstdint rather than stdint.h 2012-11-10 18:05:57 -08:00
Thomas Goyne
0893ed3f0a Remove references to tr1 2012-11-10 18:05:57 -08:00
Thomas Goyne
b077c0991b Move the split line at cursor functionality to commands 2012-11-10 18:05:57 -08:00
Thomas Goyne
9d4be82be8 Replace syntax highlighting logic with new stuff in libaegisub 2012-11-10 18:05:57 -08:00
Thomas Goyne
76adcad999 Move the spellchecker base class to libaegisub 2012-11-10 18:05:57 -08:00
Thomas Goyne
bd78692148 Use wxSTC::GetTextRaw rather than converting utf-8 -> wxString -> utf-8 2012-11-10 18:05:56 -08:00
Thomas Goyne
9088ae994c Remove windows.h from the precompiled header 
It's only used by a few source files and it defines a ton of garbage.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
08983adc96 Move agi::Color parsing to its own file 
Keeping all uses of boost.spirit in a single translation unit helps
avoid having it murder compile times, which requires that it be off by
itself.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
ea5428b65f Replace AssColor with agi::Color 
Add agi::Color, and replace AssColor and all uses of wxColor that are
not immediately passed to/from wx with it.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
83761d881a Convert AssFile::Line to an intrusive list 
Gives O(1) pointer -> iterator conversions, better memory usage, better
performance, and overall slightly simplifies the code using it.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
28175aadbe Switch to boost.container for containers of incomplete types 
STL containers are not required to support incomplete types, and while
most implementations do, clang's libc++ does not.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
59eae9ab85 Store the lines in LuaAssFile in a vector 
This makes the implementation better match the exposed interface and
simplifies some of the code.
 2012-11-10 18:05:55 -08:00
Thomas Goyne
10f0f5fc7b Kill AssFile::AddComment and just add it when writing the file 2012-11-10 18:05:55 -08:00
Thomas Goyne
a51b3d8d7f Handle errors which occur in the progress dialog worker thread 2012-11-10 18:01:22 -08:00
Thomas Goyne
ed43623743 Create well-formed ASS when reading SRT-in-Matroska 
The conversion to ASS was creating invalid lines which could not be
parsed, resulting in the worker thread crashing.

Closes #1554.
 2012-11-10 18:01:20 -08:00
Thomas Goyne
6b0ea92f8e Actually read dialogue lines from SRT-in-Matroska 
Pass the ASS parser a [Events] line before feeding it dialogue lines so
that the dialogue lines are parsed as such rather than as script info
lines.

Updates #1554.
 2012-11-10 18:01:18 -08:00
Thomas Goyne
b006bcc8c4 Commit pending audio changes on Enter in the edit box. Closes #1544. 2012-11-03 15:57:24 -07:00
Thomas Goyne
6c2ccd8639 Don't display an error when opening read-only formats 2012-10-29 06:29:45 -07:00
Thomas Goyne
b5baacec2c Fix merge error in df60c2e7a4 
Although wxSTC defines SetValue, it doesn't actually work correctly.
 2012-10-28 07:20:12 -07:00
Thomas Goyne
0e7501f45c Fix some cases where the detached video dialog would get set to bogus sizes 
At very large and very small sizes, setting the window's size with
SetSize may not actually result in the window changing to the requested
size.  Once this happened future adjustments to the size were incorrect,
and the video display would sometimes not fit in the window, and on os x
the window could get set to a negative size, with weird results.
 2012-10-27 20:44:09 -07:00
Thomas Goyne
f35e10c76a Decode the autosave path when cleaning up old files 2012-10-27 19:26:45 -07:00
Thomas Goyne
99a20e4d1c Move InvalidMarginIdError to ass_dialogue.h 2012-10-26 17:26:53 -07:00
Thomas Goyne
ce05857bfa Use std::tr1::array for AssStyle::Margin 
This eliminates the need for an explicit operator= on AssStyle.
 2012-10-26 17:26:53 -07:00
Thomas Goyne
e44c47c863 Remove $Id$ markers since git doesn't support them 2012-10-25 17:39:49 -07:00
Thomas Goyne
df60c2e7a4 Factor out a bunch of duplicated code for clipboard stuff 2012-10-25 17:39:49 -07:00
Thomas Goyne
ff6394c95e Throw only real exceptions from subtitle io stuff 2012-10-25 17:39:49 -07:00
Thomas Goyne
78b70e987e Disable Ubuntu's global menu bar for Aegisub 
wxWidgets currently doesn't generate menu open or update events for the
Ubuntu menubar (since GTK doesn't send the relevant signals to the
application), which we rely on.

Updates #1531.
 2012-10-25 17:39:49 -07:00
Thomas Goyne
67c01d11f6 Delete unfinished and unused stuff from libaegisub 2012-10-25 17:39:49 -07:00
Thomas Goyne
56ced22c63 Mark autosave files with the current date and time 
This makes it so that autosave files are (almost) never overwritten, so
that opening an old version of the file won't result in the autosaves
from a newer version being replaced.

Clean up old autosave files on startup to limit the total to 100
files/100 MB. Maybe make this configurable in the future?

Closes #1155.
 2012-10-25 07:50:31 -07:00
Thomas Goyne
40bb3b857e Allow scrolling the subtitles grid a page past the last row. Closes #888. 2012-10-20 08:26:38 -07:00
Thomas Goyne
7553534d96 Update all selected rows in the vector clip tool rather than just the active line 2012-10-20 08:07:15 -07:00
Thomas Goyne
b74130579f Update all selected rows in the rectangular clip tool rather than just the active line 2012-10-20 07:59:07 -07:00
Thomas Goyne
6b3cfcebfd Change the Effect box to a combobox like the Actor box. Closes #1461. 2012-10-20 07:34:55 -07:00
Thomas Goyne
bd3df29a1c Fix splitting lines by karaoke 
New lines have to be committed before they can be selected.

Closes #1541.
 2012-10-19 13:28:18 -07:00
Thomas Goyne
49a442bded Fix non-pch compilation 2012-10-19 08:57:56 -07:00
Thomas Goyne
8575fb9c87 Don't use wxRemoveFile in the cache cleaner 
wxRemoveFile notifies the user of errors via a dialog box, and errors
when cleaning the cache are normally just due to two copies of Aegisub
trying to clean it at the same time.
 2012-10-19 07:35:37 -07:00
Thomas Goyne
30165e4392 Truncate syllables which extend past the end of the line rather than normalizing all of the syllable lengths 2012-10-16 14:29:31 -07:00
Thomas Goyne
a267a15de0 Play right-clicked syllables when in karaoke mode 2012-10-16 14:08:20 -07:00
Thomas Goyne
7b3f2d0414 Remove pointless #pragma once from ass_file.h 2012-10-16 09:53:30 -07:00
Thomas Goyne
9547bc4ef2 Move some stuff from AssFile::Load to FrameMain::LoadSubtitles 
This is still not a very good place for it, but AssFile really shouldn't
be mucking around in global program state.
 2012-10-16 09:53:28 -07:00
Thomas Goyne
a53432736c Get wxMessageBox out of AssFile 2012-10-16 09:52:47 -07:00
Thomas Goyne
33dd0abc7f Kill AssFile::GetWildcardList 
It did not actually simplify or clarify any of the code that called it.
 2012-10-16 09:52:47 -07:00
Thomas Goyne
d3e2585faf Refactor AssParser so that AddLine is less of a monolithic monstrosity 2012-10-16 09:52:19 -07:00
Thomas Goyne
7e1bb8348a Move ASS parsing to its own class 2012-10-16 09:52:19 -07:00
Thomas Goyne
c7fd04a739 Rename ASS -> Ass in symbol names 
Most types and functions used Ass, but a decent number used ASS, so make
them consistent.
 2012-10-16 09:52:19 -07:00
Thomas Goyne
006f820aea Move ass parsing logic from AssFile to ASSSubtitleFormat 2012-10-16 09:52:19 -07:00
Thomas Goyne
712a5e0d8b Skip unprocessed keydown events in the styling assistant so that typing style names actually works 2012-10-16 08:51:21 -07:00
Thomas Goyne
b52099f0fa Delete SubtitlesGrid::SetSelectionFromAbsolute and SubtitlesGrid::GetAbsoluteSelection 
Nothing uses them anymore (and nothing should be using them).
 2012-10-15 18:16:09 -07:00
Thomas Goyne
53433426bb Fix some stuff from Coverity Scan 
Mostly just bugs in unreachable code and stylistic things, but there's a
few incorrect reachable things that were working by coincidence and
gratuitous dynamic_casts.
 2012-10-15 18:16:09 -07:00
Thomas Goyne
ccafd0be17 Update the selection correctly after setting a tag via the edit box buttons 
The valid bounds for a selection are not updated until the contents of
the edit box are updated on commit, so set the selection after
committing rather than before.
 2012-10-14 20:35:08 -07:00
Thomas Goyne
be94ab70f4 Extract cut/copy/delete lines logic from SubtitlesGrid 2012-10-14 18:57:57 -07:00
Thomas Goyne
8aeb611745 Make the correct row visible when selecting rows with shift + arrow keys in the grid. Closes #1533. 2012-10-14 08:31:16 -07:00
Thomas Goyne
b7e0af6bbb Delete BaseGrid::GetFirstSelRow() since it's no longer used by anything 2012-10-14 08:22:13 -07:00
Thomas Goyne
a40b76ea59 Insert new lines before/after the active line rather than the first selected line 2012-10-14 08:21:41 -07:00
Thomas Goyne
610b2a9494 Make pasting lines not horribly slow and bad. Closes #1534. 2012-10-13 21:32:26 -07:00
Thomas Goyne
7410e37e07 Fix some places where the margin count wasn't updated when removing ASS2 support 2012-10-12 14:54:09 -07:00
Thomas Goyne
afd24913d6 Fix find/replace derp 2012-10-12 14:54:09 -07:00
Thomas Goyne
cc3ca715a1 Set the focus to the edit box after any of the edit box buttons are clicked 2012-10-12 14:54:09 -07:00
Thomas Goyne
daf28e2005 Use the native placeholder text functionality on OS X 2012-10-12 14:54:09 -07:00
Thomas Goyne
7ca2c5cb65 Actually set the correct color tags from the color picker buttons 2012-10-12 14:54:09 -07:00
Thomas Goyne
a1fad1f947 Drop support for ASS2 
It is very unlikely that anyone has ever actually used ASS2 for
anything, and in practice it was not usable anyway as the bottom margin
was always either ignored or blindly overwritten.
 2012-10-12 14:54:08 -07:00
Thomas Goyne
983d0b19eb Add default hotkeys for the color buttons 2012-10-12 14:54:08 -07:00
Thomas Goyne
b3486440f3 Show the hotkeys for the edit box buttons in the tooltip 2012-10-12 14:54:08 -07:00
Thomas Goyne
1b68790c4b Convert the subs edit box buttons to commands 
This makes they hotkeyable and extracts a large chunk of logic from the
giant mess that is SubsEditBox.
 2012-10-12 14:54:08 -07:00
Thomas Goyne
44f0fcce07 Go through TextSelectionController rather than hitting the text edit directly in SubsEditBox 2012-10-12 14:54:08 -07:00
Thomas Goyne
a948924850 Add a TextSelectionController interface to avoid exposing the wxSTC edit directly in the context 2012-10-12 14:54:08 -07:00
Thomas Goyne
e4a6092b36 Use signals for selection change notifications 2012-10-12 14:54:07 -07:00
Thomas Goyne
a0c92f83f9 Fix some PVS-Studio warnings 2012-10-12 14:51:30 -07:00
Thomas Goyne
189615bf48 Don't use a full-size subbitmap for icons for no apparent reason 2012-10-12 14:51:30 -07:00
Thomas Goyne
7d2da48ddb Remove config_unix.h since the things it was working around were fixed years ago 2012-10-12 14:51:30 -07:00
Thomas Goyne
fc01b8bafe Delete the freetype fonts collector 
It's pretty horribly broken and fixing it would essentially consist of
rewriting fontconfig.
 2012-10-12 14:51:29 -07:00
Thomas Goyne
67af44b889 Fix compilation with no audio players enabled 2012-10-12 14:51:29 -07:00
Thomas Goyne
d0a7388581 Remove ifdef checks for header inclusion in audio_player.cpp as the headers themselves have the checks 2012-10-12 14:51:29 -07:00
Thomas Goyne
95a1b7e9b5 Remove AudioPlayer::OpenStream and CloseStream 
Instead, just pass the provider to the constructor and let the player
worry about when to create its things. The ability to explicitly open
and close the playback wasn't actually required for anything, and it
complicated the implementations of the players.
 2012-10-12 14:51:29 -07:00
Thomas Goyne
863e041d4d Honor the configured MRU limits 
Actually use the limits set in the preferences dialog rather than always
limiting the MRU lists to 16.

Currently only the Find and Replace limits can be set to above 16 due to
how the open recent items commands are implemented.

Closes #1528.
 2012-10-11 10:19:49 -07:00
Thomas Goyne
e5251544ea Don't save separate wavs for each selected line 
Instead, save a single wav spanning the full range of all selected
lines.
 2012-10-11 09:41:25 -07:00
Thomas Goyne
f691335e3b Run the icons through ImageOptim 
Knocks 70 KB off the total size.
 2012-10-10 18:49:19 -07:00
Thomas Goyne
a7bb608a34 Mark Command::Icon as const 2012-10-10 18:48:47 -07:00
Thomas Goyne
50b70f6979 Remove DOCME placeholders from AssDialogue 2012-10-10 18:48:39 -07:00
Thomas Goyne
9009c963e3 Fix rounding errors that resulted in karaoke syllables drifting 2012-10-09 20:40:49 -07:00
Thomas Goyne
004b41f0eb Switch the Duration field back to time mode when video is closed 2012-10-09 20:40:47 -07:00
Thomas Goyne
89d7e0a321 Allow framerate transform to/from variable without external timecodes loaded 
This is a potentially sensible operation (to convert from VFR to/from
the video's average FPS), so there's no reason to require that the input
and output timecodes be from different places.

Closes #1530.
 2012-10-09 09:20:35 -07:00
Thomas Goyne
a56bf25d00 Actually load the fontconfig config file in the fonts collector on OS X 2012-10-09 09:20:34 -07:00
Thomas Goyne
269dd79230 Increase the undo-group-breaking timer to 30 seconds (from 10) 2012-10-09 07:28:16 -07:00
Thomas Goyne
a13d06318b Remove all glu.h includes since no glu functions are ever used. Updates #1511. 2012-10-08 10:21:20 -07:00
Thomas Goyne
db30fdedbd Use the correct option name for reporting the user's UI language 2012-10-07 19:55:26 -07:00
Thomas Goyne
07257e1bb3 Fix non-precomp header compilation 2012-10-06 09:39:44 -07:00
Thomas Goyne
846449cb03 Center the audio display when a line is within 5% of an edge as 2.1 did 2012-10-06 08:46:10 -07:00
Thomas Goyne
de862cb6e8 Remove the correct syllable split on a click on the left side of the split line 2012-10-05 08:21:40 -07:00
Thomas Goyne
5cdcd3dcb3 Increase the hit area for removing syllable splits a little 2012-10-05 08:21:40 -07:00
Thomas Goyne
d0a9f3f7cd Change the karaoke split cursor color to indicate whether it'll add or remove a split 2012-10-05 08:21:40 -07:00
Thomas Goyne
1cd9f2dcf2 Add a default hotkey for "audio/play/line" 2012-10-04 16:56:02 -07:00
Thomas Goyne
d97ad27354 Add the play line button to the audio toolbar 2012-10-04 16:49:55 -07:00
Thomas Goyne
44468fbd3d Add "audio/play/line" command 2012-10-04 16:48:35 -07:00
Thomas Goyne
7343392823 Don't use StandardPaths before OnInit is called 
AegisubLocale is created extremely early in the application
initialization, and using StandardPaths in its constructor resulted in
?user being set to an incorrect value as the app name hadn't been set
yet.
 2012-10-04 12:58:01 -07:00
Thomas Goyne
782c6310f3 Don't include glu.h in the precompiled header since it's never actually used 2012-10-03 15:58:14 -07:00
Thomas Goyne
1f6a6087c6 Remove waf build system since it's pretty out of date 2012-10-02 16:06:05 -07:00
Thomas Goyne
40f97dbfea Redesign AegisubLocale 
Use wxTranslations directly rather than going through wxLocale. This
significantly simplifies the code, eliminates the hardcoded list of
languages for non-windows, and makes it possible to use mismatched
languages and locales.

Closes #1508.
 2012-10-02 16:06:05 -07:00
Thomas Goyne
8fad077e88 Don't ignore loaded timecodes when converting frames to times for the subtitle renderer 2012-10-02 12:56:19 -07:00
Thomas Goyne
57a253004d Scroll the audio display after a click near an edge 
When auto scrolling is enabled, scroll the audio display after a click
near an edge to mimic the effect of scrolling to show the new audio
selection (as 2.1.9 did), but hopefully without all the weird
undesirable cases that had.
 2012-10-02 08:09:33 -07:00
Thomas Goyne
05f5d37576 Split AudioDisplay::OnMouseEvent into several methods 2012-10-02 07:40:50 -07:00
Thomas Goyne
3d3a74c5d2 Audio display cosmetics 2012-10-02 07:27:52 -07:00
Thomas Goyne
55bdbf8d48 Add scroll arrows to the karaoke syllable bar when the contents are too wide to fit. Closes #1516. 2012-10-01 16:55:20 -07:00
Thomas Goyne
b020322a3a Update the size of the karaoke syllable bar when the window is resized. Updates #1516. 2012-10-01 15:38:02 -07:00
Thomas Goyne
1b089795f1 Also stop the video when stopping audio playback as 2.1.9 did. Closes #1515. 2012-10-01 10:28:42 -07:00
Thomas Goyne
0a5fa6ff39 Don't use ARC in the Obj-C++ code 
It never allocated any non-autoreleased objects so ARC wasn't actually
doing anything other than breaking compilation with gcc.
 2012-09-29 22:10:45 -07:00
Thomas Goyne
25e65237cd Mark "Action" as translatable in the fonts collector dialog 
Fortunately "Action" is also used in the select lines dialog so it's
already present in the translations.
 2012-09-27 17:10:33 -07:00
Thomas Goyne
08c9781dfb Actually modify the line time when applying lead-in/out in karaoke mode 2012-09-24 18:56:49 -07:00
Thomas Goyne
7433b814a7 Modify the first syllable when normalizing karaoke syllable lengths 2012-09-24 18:46:15 -07:00
Thomas Goyne
85f2774033 Report the user's UI language in addition to the system language to the update checker 2012-09-24 13:00:52 -07:00
Thomas Goyne
ccf3e94d96 Bundle the Serbian translation as sr_YU on OS X as it doesn't have sr_RS 2012-09-23 08:20:24 -07:00
Thomas Goyne
51e23a3c7e Remove the period from the catalog name since gettext seems to not like it 2012-09-22 21:29:44 -07:00
Thomas Goyne
39bf2ab5fd Don't list languages in the language dialog which won't actually work. Updates #1508. 2012-09-22 09:51:39 -07:00
Thomas Goyne
9a6eb70f12 Try to find an English locale ID which is available 
wxLANGUAGE_ENGLISH corresponds to the "en" locale on Linux, which is
generally not installed, which resulted in English actually being the
system default locale.

Updates #1508.
 2012-09-22 09:42:32 -07:00
Thomas Goyne
c4f6e729f9 Add missing period in 2.35 in a string that probably isn't actually visible anywhere 2012-09-21 18:13:10 -07:00
Thomas Goyne
6943b868da Handle file not found errors when opening linked audio from subtitles 2012-09-21 18:07:30 -07:00
Thomas Goyne
ffab39b21f Don't automatically load audio from video if audio from that file is already open 2012-09-21 17:58:22 -07:00
Thomas Goyne
7b5bb6f57a Add missing languages to the hardcoded list for non-windows 2012-09-16 19:12:05 -07:00
Thomas Goyne
ef99f77087 Make the open/save keyframes dialog title translatable 2012-09-16 18:52:50 -07:00
Thomas Goyne
2c2f60d4e0 Fix completely incorrect behavior when AR changing is enabled in the resolution resampler 2012-09-14 07:55:31 -07:00
Thomas Goyne
e552dc4c9c Remove some dead assigns 2012-09-14 07:55:01 -07:00
Thomas Goyne
9ae6e3c538 Fix compilation with precompiled headers disabled 2012-09-06 08:25:38 -07:00
Thomas Goyne
0d1ffbbdf7 Update manual URL 2012-09-03 17:28:45 -07:00
Thomas Goyne
1c9af767e5 Move audio decode error handling to GetAudio 
Errors when not getting with volume need to be handled too.

Updates #1509.
 2012-09-01 21:45:18 -07:00
Thomas Goyne
e995cd2616 Don't stop video playback when undoing or redoing changes 2012-09-01 21:45:17 -07:00
Thomas Goyne
9f8e25ed0a Force LC_CTYPE to en_US.UTF-8 on OS X 
When run from an app bundle the locale environment variables are unset,
and the default locale settings are bogus as a result.
 2012-08-26 19:15:48 -07:00
Thomas Goyne
09962a56d1 Use the last valid mouse position for VideoDisplay::GetMousePosition 
On Windows opening the context menu triggers a mouse leave event, which
invalidates the current mouse position, so the Copy coordinates to
Clipboard command didn't work.
 2012-08-25 18:33:46 -07:00
Thomas Goyne
b0036b4d99 Statically link libaegisub 
Dynamically linking it caused a steady stream of issues for no apparent
benefits.
 2012-08-21 07:02:45 -07:00
Thomas Goyne
4208fa362c Fix stack check failure when a script fails to load in a debug build 2012-08-19 20:32:18 -07:00
Thomas Goyne
1e030289ad Revamp how version tagging works 
Rather than having it be a configurable option, simply build in final
release mode if Aegisub is being built from a signed tag, and get the
version information from that tag.

Drop the version number from the OS X app bundle when not building from
a tag as it done everywhere else. Drop the arch suffix since ppc hasn't
been tested in years and isn't worth testing as it's only going to get
less relevant as time goes on.

Remove some redundant definitions in the build system.
 2012-08-19 14:33:50 -07:00
Thomas Goyne
42a016a83b Update the revision checks to work with a pure-git repo 2012-08-19 14:05:38 -07:00
Thomas Goyne
18db0b09ac Log audio decoding errors 
Originally committed to SVN as r6961.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
79684d5ad6 Factor out bounds-checking for GetAudio to a single place 
It was being done in inconsistent ways in several places, which did not
include all of the places it needed to be done.

Closes #1509.

Originally committed to SVN as r6960.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
037d385419 Guard uses of audio providers with a mutex when not using a cache as they aren't thread-safe. Updates #1509. 
Originally committed to SVN as r6959.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
5a38d69921 Open files as binary in TextFileReader 
Text mode does undesirable things like stopping when it hits an EOF
byte, which can be a valid part of a UTF-16 character, and line_iterator
handles stripping \r anyway.

Originally committed to SVN as r6958.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
e774902a29 Always write a newline at the end of ASS files 
Originally committed to SVN as r6957.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
b265d1fa0e Actually set the actor when reading from txt files 
Originally committed to SVN as r6956.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
d132364025 Fix check for OS X version in the update checker 
Originally committed to SVN as r6955.
 2012-08-19 14:11:28 -07:00
Thomas Goyne
21841e84a8 Get the locale name for OS X from CF rather than wx 
Originally committed to SVN as r6954.
 2012-08-19 14:11:28 -07:00
Thomas Goyne
f2035d76fc Don't block the source of a drag-and-drop while the dropped audio/video are loading 
Originally committed to SVN as r6953.
 2012-08-04 16:31:44 +00:00
Thomas Goyne
b86a1bfb2d Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504. 
Originally committed to SVN as r6952.
 2012-08-03 02:32:30 +00:00
Thomas Goyne
e2e304f2cb Don't try to shift to a negative start time when shifting lines to frame zero 
Originally committed to SVN as r6951.
 2012-07-29 03:23:27 +00:00
Thomas Goyne
ffe41cdf20 Don't discard frames which are decoded before the video display becomes visible 
Originally committed to SVN as r6950.
 2012-07-29 03:23:24 +00:00
Thomas Goyne
8c42f09235 Don't pass size_t to wxString::Format since there's no portable specifier for it 
Originally committed to SVN as r6949.
 2012-07-24 02:40:39 +00:00
Thomas Goyne
8ba149a7e6 Actually save the video zoom to the subtitles file 
Originally committed to SVN as r6948.
 2012-07-24 02:40:37 +00:00
Thomas Goyne
65d3c4cc2d Save keyframe and timecode file names even if video isn't loaded 
Originally committed to SVN as r6947.
 2012-07-24 02:40:34 +00:00
Thomas Goyne
de7dd7e07f Use the video AR from the script rather than the video's AR when opening linked video 
Originally committed to SVN as r6946.
 2012-07-24 02:40:31 +00:00
Thomas Goyne
269a206053 Fix loading linked audio when automatic opening of audio from video is enabled 
Originally committed to SVN as r6945.
 2012-07-24 02:40:29 +00:00
cantabile
7bd7ef7cd6 Shift times: Make Enter in the time edit do the same as clicking OK 
Originally committed to SVN as r6944.
 2012-07-24 02:39:40 +00:00
cantabile
5ecb89eeec Shift times: Use TimeEdit::SetTime() instead of TimeEdit::SetValue() 
TimeEdit::SetValue() will trigger TimeEdit::OnModified(), but that
doesn't always update the internal "time" property.
TimeEdit::OnModified() seems to be designed to handle editing the value
with the keyboard, not with SetValue().

Originally committed to SVN as r6943.
 2012-07-24 02:39:37 +00:00
cantabile
3193e05747 Use correct format specifier in AssColor::GetSSAFormatted() 
Avoids a ton of assertion failures when saving SSA files.

Originally committed to SVN as r6942.
 2012-07-24 02:39:35 +00:00