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

3180 commits

Author SHA1 Message Date
Thomas Goyne
08a61c7fd4 Refactor LuaAssFile's implementation 
Switch to 1-based indices to match Lua rather than converting back and
forth all over the place.

Eliminate a bunch of duplicated code.

Fix a few memory leaks.

Automatically set an undo point at the end of a macro if there are any
uncommited changes.

Originally committed to SVN as r5630.
 2011-09-28 19:47:03 +00:00
Thomas Goyne
df100fb5a5 Pass a project context to AssExportFilter::GetConfigDialogWindow so that export filters don't have to use things like AssFile::top and VideoContext::Get 
Originally committed to SVN as r5629.
 2011-09-28 19:46:53 +00:00
Thomas Goyne
9ce579e187 Document and clean up a bunch of exporter related things. Break some friendships, and add a getter for export filter names. 
Originally committed to SVN as r5628.
 2011-09-28 19:46:41 +00:00
Thomas Goyne
cec07012e7 Add auto4_lua_factory.h to the vc9 project 
Originally committed to SVN as r5627.
 2011-09-28 19:46:32 +00:00
Thomas Goyne
dfc18afd34 Replace custom karaoke parsing code in LuaAssFile with AssKaraoke 
Originally committed to SVN as r5626.
 2011-09-28 19:46:23 +00:00
Thomas Goyne
1329245a21 Clean up the automation dialog and don't let the user load the same script twice 
Originally committed to SVN as r5625.
 2011-09-28 19:46:14 +00:00
Thomas Goyne
53c0b6ff3a Clean up and document ScriptFactory, and add a function to get the full wildcard string for all registered automation engines 
Originally committed to SVN as r5624.
 2011-09-28 19:46:05 +00:00
Thomas Goyne
7680d6c246 Move the local script logic from FrameMain to a new LocalScriptManager 
Originally committed to SVN as r5623.
 2011-09-28 19:45:55 +00:00
Thomas Goyne
3029436a2d Drop some AS5-specific stuff in LuaAssfile 
Originally committed to SVN as r5622.
 2011-09-28 19:45:47 +00:00
Thomas Goyne
0a91be1c7c Unconditionally enable building automation even if there are no enabled engines as there isn't really any reason not to and the defines uglify the code. 
Originally committed to SVN as r5621.
 2011-09-28 19:45:35 +00:00
Thomas Goyne
66e826edb3 Split LuaProgressSink into its own cpp file to cut down on the bloatedness of auto4_lua.cpp 
Originally committed to SVN as r5620.
 2011-09-28 19:45:25 +00:00
Thomas Goyne
0b6ef72242 Rewrite LuaScriptReader, making it simpler and adding support for more charsets 
Originally committed to SVN as r5619.
 2011-09-28 19:45:16 +00:00
Thomas Goyne
432abc309b Remove WITH_OLD_HUNSPELL. 1.2.0 is four years old and the configure script doesn't even support older versions that would require WITH_OLD_HUNSPELL 
Originally committed to SVN as r5618.
 2011-09-28 19:45:07 +00:00
Thomas Goyne
4ec507f814 Clean up SubtitleFormat 
Document all of the SubtitleFormat methods.

Add default implementations of CanReadFile and CanWriteFile that check
against the appropriate wildcard list.

Clean up and simplify a lot of very odd code.

Throw typed exceptions in all subtitle readers rather than strings.

Originally committed to SVN as r5617.
 2011-09-28 19:44:53 +00:00
Thomas Goyne
156885b56d Make AudioTimingControllerDialogue operate on a project context 
Originally committed to SVN as r5616.
 2011-09-28 19:44:44 +00:00
Thomas Goyne
a25c5c1909 Rewrite the subtitles edit control's syntax highlighting 
Simplify and clean up the parsing code to better represent how VSFilter
actually handles many odd edge cases as well as making it significantly
faster.

Use an enum for syntax style IDs rather than magic numbers.

Add styles for comments, draw mode and karaoke templater variables
rather than reusing other styles and move some hardcoded style
information to the config file.

Operate on the utf-8 representation of the edit box text rather than a
wxString, as it's both faster and simpler.

Originally committed to SVN as r5615.
 2011-09-28 19:44:34 +00:00
Thomas Goyne
67ab06e830 Add an optional argument to AssFile::Commit which indicates that only a single line was changed. Currently used only to cut down on file copies when coalescing. 
Originally committed to SVN as r5614.
 2011-09-28 19:44:24 +00:00
Thomas Goyne
c936306593 Rewrite nearly everything related to karaoke 
Move most karaoke parsing/serializing/editing code to AssKaraoke rather
than being scattered all over the place, and add much better support for
non-karaoke override tags and comments.

Add a karaoke timing controller.

Redesign the karaoke syllable split/join interface to have a single mode
from which both splitting and joining can be done rather than separate
split and join modes.

Only show the karaoke split/join bar when karaoke mode is enabled.

Closes #886, #987, #1190.

Originally committed to SVN as r5613.
 2011-09-28 19:44:07 +00:00
Thomas Goyne
cc147d1660 Eliminate uses of c_str made unnecessary by changed to wxString::Format in wx 2.9 
Originally committed to SVN as r5612.
 2011-09-28 19:43:48 +00:00
Thomas Goyne
d990bbbb99 Eliminate all unnecessary uses of L and _T 
Originally committed to SVN as r5611.
 2011-09-28 19:43:11 +00:00
Niels Martin Hansen
7250b89cbd MSBuild project updates. 
Originally committed to SVN as r5603.
 2011-09-15 14:50:08 +00:00
Thomas Goyne
088976554c Fix non-precomp-header compilation 
Originally committed to SVN as r5602.
 2011-09-15 06:12:26 +00:00
Thomas Goyne
d70fb7fe2d Fix compilation errors 
Originally committed to SVN as r5601.
 2011-09-15 06:03:13 +00:00
Thomas Goyne
683dd6c0a9 Kill BaseGrid::SelectVisible 
Originally committed to SVN as r5600.
 2011-09-15 05:17:43 +00:00
Thomas Goyne
11c40188c2 Eliminate some old selection code in BaseGrid 
Originally committed to SVN as r5599.
 2011-09-15 05:17:36 +00:00
Thomas Goyne
05da23b22f Mostly detangle the edit box from the subtitles grid 
Originally committed to SVN as r5598.
 2011-09-15 05:17:29 +00:00
Thomas Goyne
3c4191e649 Kill SubtitlesGrid::SetSubsToVideo 
Originally committed to SVN as r5597.
 2011-09-15 05:17:22 +00:00
Thomas Goyne
0c4eb020a4 Rewrite the shift times dialog, detangling it from the grid and making it modeless, and add support for characters outside the local charset in the shift history file path. Closes #1269. 
Originally committed to SVN as r5596.
 2011-09-15 05:17:14 +00:00
Thomas Goyne
1f095b0a01 Remove the SubsEditBox from the context in favor of the SubsEditTextCtrl as it was the only public member of SubsEditBox 
Originally committed to SVN as r5595.
 2011-09-15 05:17:07 +00:00
Thomas Goyne
d022d2ae56 Eliminate pointless (and slow) setting of the edit box to its current text 
Originally committed to SVN as r5594.
 2011-09-15 05:17:00 +00:00
Thomas Goyne
5b3b821696 Always keep the active line visible in the grid 
Originally committed to SVN as r5593.
 2011-09-15 05:16:54 +00:00
Thomas Goyne
1cc5d4001a Rewrite the selection dialog, detangling it from SubtitlesGrid and making it modeless 
Originally committed to SVN as r5592.
 2011-09-15 05:16:47 +00:00
Thomas Goyne
584f36a744 Detangle the spellchecker dialog from the subtitles grid, make it modelss, and fix a lot of edges cases 
Originally committed to SVN as r5591.
 2011-09-15 05:16:41 +00:00
Thomas Goyne
934a5b24eb Refine the commit types 
Switch to a bitmask with much more finely-grained information about what
changed in the commit, fixing a few potential correctness problems and
significantly improving the performance of several scenarios where commits
are spammed very frequently.

Originally committed to SVN as r5590.
 2011-09-15 05:16:32 +00:00
Thomas Goyne
3f05fe6b3e Add support for labels in the audio display 
Originally committed to SVN as r5589.
 2011-09-15 05:16:26 +00:00
Thomas Goyne
3e708eab10 Slightly simplify parts of AudioDisplay 
Originally committed to SVN as r5588.
 2011-09-15 05:16:18 +00:00
Thomas Goyne
e5d660e281 Hide visual tools while video is playing. Closes #1336. 
Originally committed to SVN as r5586.
 2011-09-02 00:03:40 +00:00
Thomas Goyne
182b57bd0f Fix compilation with precompiled headers off 
Originally committed to SVN as r5579.
 2011-08-31 04:23:18 +00:00
Thomas Goyne
d82e2bb496 Use wxEVT_CONTEXT_MENU for context menus rather than right button down so that the context menu key works correctly. Updates #1238. 
Originally committed to SVN as r5578.
 2011-08-31 04:17:37 +00:00
Thomas Goyne
1c4410bb87 Make middle-click on the audio display seek the video to the clicked on time 
Originally committed to SVN as r5577.
 2011-08-31 04:17:31 +00:00
Thomas Goyne
02d4ee0cec Revert when the dialogue timing controller is created to avoid broken behavior when leaving karaoke mode 
Originally committed to SVN as r5576.
 2011-08-31 04:17:24 +00:00
Thomas Goyne
7155ace1d9 Fix merge error in ass_file.h 
Originally committed to SVN as r5573.
 2011-08-27 07:28:04 +00:00
Thomas Goyne
0de3ce42d5 Speed up BlockCache::Age somewhat 
Originally committed to SVN as r5572.
 2011-08-27 06:52:49 +00:00
Thomas Goyne
03d7849d12 Significantly speed up grid painting, especially when only some columns need to be repainted 
Originally committed to SVN as r5571.
 2011-08-27 06:52:42 +00:00
Thomas Goyne
b8a1674c27 Remove some cruft from ScintillaTextCtrl and make SetUnicodeStyling significantly faster 
Originally committed to SVN as r5570.
 2011-08-27 06:52:35 +00:00
Thomas Goyne
ccf9f64818 Make Assfile::SetScriptInfo slightly less slow 
Originally committed to SVN as r5569.
 2011-08-27 06:42:10 +00:00
Thomas Goyne
e12bcc6aef Bind VideoContext::OnFileSave to the file save signal rather than the commit signal 
Originally committed to SVN as r5568.
 2011-08-27 06:42:03 +00:00
Thomas Goyne
b14b2eceea Update the Makefile and vc2010 project 
Originally committed to SVN as r5567.
 2011-08-27 06:37:03 +00:00
Thomas Goyne
2006995645 Revert pending changes when audio is opened to fix problems with stale data 
Originally committed to SVN as r5566.
 2011-08-27 06:30:56 +00:00
Thomas Goyne
a45b971b3a Redesign ToggleBitmap to operate on a command 
Originally committed to SVN as r5565.
 2011-08-27 06:30:49 +00:00
Thomas Goyne
3ecfd34bd3 Convert the audio toolbar over to the new dynamic toolbar system 
Originally committed to SVN as r5564.
 2011-08-27 06:30:42 +00:00
Thomas Goyne
fc0db4fc36 Convert the VideoDisplay context menu over to the new menu system 
Originally committed to SVN as r5563.
 2011-08-27 06:30:35 +00:00
Thomas Goyne
e2f464c94f Add commands for the video display context menu items 
Originally committed to SVN as r5562.
 2011-08-27 06:30:29 +00:00
Thomas Goyne
ca6d5b1f3e Rearrange VideoDisplay's privates to make them a bit less randomly ordered and switch from auto_ptr to scoped_ptr 
Originally committed to SVN as r5561.
 2011-08-27 06:30:23 +00:00
Thomas Goyne
bc70429ffb Remove #pragma once from subs_grid.h 
Originally committed to SVN as r5560.
 2011-08-27 06:30:16 +00:00
Thomas Goyne
41119ff6fc Convert the subtitles grid context menu over to the new menu system 
Originally committed to SVN as r5559.
 2011-08-27 06:30:10 +00:00
Thomas Goyne
017a6aa27d Do stuff to the AVS video provider 
Remove the Matroska keyframe/timecode loading code, as opening MKVs via
Avisynth is dumb and didn't work very well anyway.

Fix framerate reporting by actually bothering to read the video
information before trying to use it.

Kill the VFW wrapper and just put the code in the avisynth video source.

If reading the keyframes from an avi file fails just warn the user
rather than refuse to load the video.

Originally committed to SVN as r5558.
 2011-08-27 06:30:03 +00:00
Thomas Goyne
27867421b2 Fix some whitespace in frame_main.cpp 
Originally committed to SVN as r5557.
 2011-08-27 06:29:57 +00:00
Thomas Goyne
fb1e6fcbaf Delete some obsolete event handling in FrameMain 
Originally committed to SVN as r5556.
 2011-08-27 06:29:51 +00:00
Thomas Goyne
5d07756838 Kill FrameMain::HasASSDraw as it's no longer used 
Originally committed to SVN as r5555.
 2011-08-27 06:29:45 +00:00
Thomas Goyne
626df4db05 Rewrite the dynamic menu generation code 
Remove hardcoded assumptions about where in the menu items are and
instead bind menu items directly to commands so that customizing the
menu actually works.

Add support for user menu files that override the default one.

Add better support for multiple menus so that all of the menus can
potentially be created by the dynamic menu system rather than just the
main menu bar.

Add support for commands whose names change based on the current project
state so that undo and redo can work properly.

Simplify the menu json format and make commands responsible for
controlling what type of menu item is created rather than allowing
nonsensical configurations.

The Automation menu is currently not implemented.

Originally committed to SVN as r5554.
 2011-08-27 06:29:36 +00:00
Thomas Goyne
319b454bb8 Add hotkeys to the tooltip for toolbar items 
Originally committed to SVN as r5538.
 2011-08-17 05:32:27 +00:00
Thomas Goyne
d3e7f02597 Update the video box time boxes when detached video is first opened 
Originally committed to SVN as r5537.
 2011-08-17 05:32:21 +00:00
Thomas Goyne
20258438ec Fix incorrect initial size of the detached video dialog 
Originally committed to SVN as r5536.
 2011-08-17 05:32:15 +00:00
Thomas Goyne
0c1794a93f Don't silently fail to start up if a config file is invalid 
Originally committed to SVN as r5535.
 2011-08-17 05:32:09 +00:00
Thomas Goyne
330411c94a Add some special cases to line_iterator that makes it significantly faster in common cases 
Originally committed to SVN as r5534.
 2011-08-17 05:32:01 +00:00
Thomas Goyne
561216d4c8 Make hotkey::check take a project context and make FrameMain::context private 
Originally committed to SVN as r5532.
 2011-07-29 23:16:55 +00:00
Thomas Goyne
ef26170214 Rearrange FrameMain deinitialization so that things which depend on the project context are guaranteed to be destroyed before the context 
Originally committed to SVN as r5531.
 2011-07-29 23:16:46 +00:00
Thomas Goyne
65368c5f35 Detangle FrameMain and DialogDetachedVideo 
Originally committed to SVN as r5530.
 2011-07-29 23:16:36 +00:00
Thomas Goyne
3f50ce6d46 Delete FrameMain::LoadVFR as it's not longer used by anything 
Originally committed to SVN as r5529.
 2011-07-29 23:16:24 +00:00
Thomas Goyne
59755b5bb5 Add command to toggle medusa mode and fix the command names for many hotkeys 
Originally committed to SVN as r5528.
 2011-07-27 22:59:11 +00:00
Thomas Goyne
6d8d1a48d3 Disable precompiled headers for the C files in release builds and not just debug 
Originally committed to SVN as r5527.
 2011-07-27 22:59:01 +00:00
Thomas Goyne
1cacc33d2d Simplify version.cpp 
Originally committed to SVN as r5526.
 2011-07-27 22:52:37 +00:00
Thomas Goyne
3a4c48d8df Fix compilation without precompiled headers 
Originally committed to SVN as r5525.
 2011-07-27 17:21:39 +00:00
Thomas Goyne
db965eb766 Unbreak tag hiding in the grid 
Originally committed to SVN as r5524.
 2011-07-27 05:54:25 +00:00
Thomas Goyne
d937bd80e7 Make opening audio from video actually work 
Originally committed to SVN as r5523.
 2011-07-27 05:36:42 +00:00
Thomas Goyne
0cc902487d Remove a now-bogus sanity check on thread count in the ffms video provider 
Originally committed to SVN as r5522.
 2011-07-27 05:36:36 +00:00
Thomas Goyne
d3ab35a61f Use PersistLocation for DialogColorPicker 
Originally committed to SVN as r5521.
 2011-07-27 05:36:30 +00:00
Thomas Goyne
833c35f6ae Use PersistLocation for DialogStyleManager 
Originally committed to SVN as r5520.
 2011-07-27 05:36:24 +00:00
Thomas Goyne
fc46b25726 Rewrite the translation assisant and make it work again 
Originally committed to SVN as r5519.
 2011-07-27 05:36:15 +00:00
Thomas Goyne
07b77203f1 Rewrite the styling assisant as changes to other parts of Aegisub have made almost all of it broken 
Originally committed to SVN as r5518.
 2011-07-27 05:36:09 +00:00
Thomas Goyne
f906c3dcd2 Factor DialogDetachedVideo's position persistance logic into a seperate class so that it can be used for other dialogs. 
Originally committed to SVN as r5517.
 2011-07-27 05:36:02 +00:00
Thomas Goyne
3c18ed542c Clean up libaegisub includes 
Consistently use the C++ names for headers rather than a combination of the
C and C++ names.

Remove empty LAGI_PRE blocks.

Remove checks for both AGI_PRE and LAGI_PRE and change a check for only
AGI_PRE to LAGI_PRE.

Originally committed to SVN as r5516.
 2011-07-26 22:25:21 +00:00
Thomas Goyne
ead31761db Include lagi_pre.h in agi_pre.h and remove all duplicates 
This eliminates some duplicated logic and potential tr1/non-tr1 header
mismatches, and removes the need for the #if defined(AGI_PRE) ||
defined(LAGI_PRE) guard that was used in a few of the libaegisub headers.

Originally committed to SVN as r5515.
 2011-07-26 22:25:10 +00:00
Thomas Goyne
665cddf235 Remove some duplicated includes in lagi_pre.h 
Originally committed to SVN as r5514.
 2011-07-26 22:24:59 +00:00
Thomas Goyne
2ca6a04543 Remove the C++-only check from agi_pre.h and just don't include it in the C files 
Originally committed to SVN as r5513.
 2011-07-26 22:24:48 +00:00
Thomas Goyne
12318ced75 Remove the include guard from agi_pre.h as it seems to have magically become unnessesary 
Originally committed to SVN as r5512.
 2011-07-26 22:24:38 +00:00
Thomas Goyne
e92d6f6f65 Don't pass CXXFLAGS to the compiler when compiling .c files 
Originally committed to SVN as r5511.
 2011-07-26 22:24:26 +00:00
Thomas Goyne
263d161d26 Don't pointlessly store a copy of the default hotkeys json in memory 
Originally committed to SVN as r5510.
 2011-07-26 20:26:09 +00:00
Thomas Goyne
8e975941b7 Fix inconsistant usage of 'Enter' and 'Return' by switching everything to 'Enter' 
Originally committed to SVN as r5509.
 2011-07-26 19:53:08 +00:00
Thomas Goyne
af484a469d Make get_hotkey_str_first more likely to return the desired hotkey when multiple are available 
Originally committed to SVN as r5508.
 2011-07-26 19:52:57 +00:00
Thomas Goyne
dd38e1f07f Don't swallow errors when parsing json and make agi::json_util::file actually work 
Originally committed to SVN as r5507.
 2011-07-26 19:52:47 +00:00
Thomas Goyne
dabcdb2e8b Uninvert hotkey::Scan's return value 
Originally committed to SVN as r5506.
 2011-07-26 19:52:36 +00:00
Thomas Goyne
ffe8c7a5d6 Only enable the 'Always' hotkey context when medusa mode is on 
Originally committed to SVN as r5505.
 2011-07-26 19:52:25 +00:00
Thomas Goyne
7deebf759b Remove the concept of disabled hotkeys; it's unnessesary and wasn't actually used 
Originally committed to SVN as r5504.
 2011-07-26 19:52:15 +00:00
Thomas Goyne
acd26c4c48 Fiddle with the log output format so that Visual Studio's parser reads it correctly 
Originally committed to SVN as r5503.
 2011-07-26 19:52:07 +00:00
Thomas Goyne
87abcddd87 Make the MRU code not so bizzarely overcomplicated 
Originally committed to SVN as r5502.
 2011-07-26 19:51:56 +00:00
Thomas Goyne
7824348f10 Include the name of the option in the exception thrown when an option is not found 
Originally committed to SVN as r5501.
 2011-07-26 19:51:47 +00:00
Thomas Goyne
a33da9cba5 Replace all uses of std::cout in libaegisub with logging statements and eliminate a lot of nonsense in the windows implementation of acs::Check 
Originally committed to SVN as r5500.
 2011-07-26 19:51:38 +00:00
Thomas Goyne
64a3cc94ae Fix error checking in agi::util::strtoi 
Originally committed to SVN as r5499.
 2011-07-26 19:51:28 +00:00