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

3534 commits

Author SHA1 Message Date
Thomas Goyne
85bfb91f73 Add cajun headers to the vc9 libaegisub project 
Originally committed to SVN as r5745.
 2011-10-17 21:59:24 +00:00
Thomas Goyne
2f43ef2fca Clean up the color picker dialog somewhat 
Originally committed to SVN as r5744.
 2011-10-17 17:52:49 +00:00
Thomas Goyne
04e385b4d5 Fix potential crash when opening the colorpicker dialog caused by use of an uninitialized variable 
Originally committed to SVN as r5743.
 2011-10-17 17:52:40 +00:00
Thomas Goyne
8daa6cfdc2 When setting the start or end time of a subtitle line to the current video frame, if the resulting line duration would be less than one frame also update the other time 
Originally committed to SVN as r5742.
 2011-10-17 17:52:31 +00:00
Thomas Goyne
6895e91e7c Fix validation for Make Lines Continuous 
Originally committed to SVN as r5741.
 2011-10-17 17:52:22 +00:00
Thomas Goyne
cc9cc6d713 Use FFMS_SetOutputFormatV2 with sufficiently recent FFMS2 rather than the deprecated FFMS_SetOutputFormatV 
Originally committed to SVN as r5740.
 2011-10-17 17:52:11 +00:00
Thomas Goyne
98777eff4e Use the per-platform default audio player from configure rather than always defaulting to portaudio 
Originally committed to SVN as r5738.
 2011-10-12 23:08:29 +00:00
Thomas Goyne
bb4c10a140 Make the audio play commands stop the video like in 2.1.x 
Originally committed to SVN as r5737.
 2011-10-12 23:08:20 +00:00
Thomas Goyne
bf5e504c59 Combine duplicated commands time/snap/frame and time/frame/current into one command that actually works 
Originally committed to SVN as r5736.
 2011-10-12 23:08:11 +00:00
Thomas Goyne
54f359f91b Enable the correct shift amount text box when opening the shift times dialog rather than always enabling the time one 
Originally committed to SVN as r5735.
 2011-10-12 23:08:02 +00:00
Thomas Goyne
b7efafe3b8 Fix calculation of the time column widths 
Originally committed to SVN as r5734.
 2011-10-12 23:07:38 +00:00
Thomas Goyne
98786aecba Fix the spelling of 'Choose...' in the preferences dialog 
Originally committed to SVN as r5733.
 2011-10-11 04:33:41 +00:00
Thomas Goyne
306664d16e Make the browse and font pick buttons in the preferences dialog actually work, and delete BrowseButton as it's no longer used by anything. 
Originally committed to SVN as r5732.
 2011-10-11 00:06:44 +00:00
Thomas Goyne
91ab2ee9ba Make option names not dumb and wrong 
Originally committed to SVN as r5731.
 2011-10-11 00:06:34 +00:00
Thomas Goyne
a3d9deddb9 Fix endless recursion between SubsTextEditCtrl::UpdateCallTip and UpdateStyle 
Originally committed to SVN as r5730.
 2011-10-11 00:06:25 +00:00
Thomas Goyne
557e61722b Kill DialogStyleEditor::OnChooseFont, which has been unused for over four years 
Originally committed to SVN as r5729.
 2011-10-11 00:06:13 +00:00
Thomas Goyne
7dfaa6427c Implement the video position marker in the audio display 
Originally committed to SVN as r5728.
 2011-10-10 21:04:23 +00:00
Thomas Goyne
a260a998b3 Convert newlines to \N when pasting rather than trying to clean them up later 
Originally committed to SVN as r5727.
 2011-10-10 20:59:04 +00:00
Thomas Goyne
6e30ff633c Fix compilation without precompiled headers 
Originally committed to SVN as r5726.
 2011-10-10 19:30:11 +00:00
Thomas Goyne
fdf74309a5 Don't revert changes to the filename made when undoing. Updates #1345. 
Originally committed to SVN as r5725.
 2011-10-10 17:29:35 +00:00
Thomas Goyne
eb947b3914 Remove dead code in AssFile::CanSave 
Originally committed to SVN as r5724.
 2011-10-10 17:29:26 +00:00
Thomas Goyne
e91834d667 Fix a few colourbutton issues in DialogStyleEditor 
Originally committed to SVN as r5723.
 2011-10-10 17:29:17 +00:00
Thomas Goyne
bd18ad11cb Fix bug making it impossible to modify styles via the style editor 
Originally committed to SVN as r5722.
 2011-10-10 17:29:09 +00:00
Thomas Goyne
882ee76d59 Eliminate large amounts of duplicated code in DialogStyleEditor 
Originally committed to SVN as r5721.
 2011-10-10 17:28:59 +00:00
Thomas Goyne
cbcc581cea Use PersistLocation for saving and restoring DialogStyleEditor's position 
Originally committed to SVN as r5720.
 2011-10-10 17:28:48 +00:00
Thomas Goyne
9ccd06b610 Uninvert playing the first/last 500ms of the selection 
Originally committed to SVN as r5709.
 2011-10-01 18:35:37 +00:00
Thomas Goyne
ac37a080c4 Change edit/search_replace to edit/find_replace in the default menu 
Originally committed to SVN as r5708.
 2011-10-01 18:35:31 +00:00
Thomas Goyne
a8caf35ebe Fix flipped subtitles with libass + avisynth 
Originally committed to SVN as r5707.
 2011-10-01 18:35:25 +00:00
Thomas Goyne
8624f923d9 Add edit box font face and size to the preferences dialog 
Originally committed to SVN as r5706.
 2011-10-01 18:35:19 +00:00
Thomas Goyne
3ff8591c22 Add a third period to ellipses with only two 
Originally committed to SVN as r5705.
 2011-10-01 18:35:12 +00:00
Thomas Goyne
9b00fad2fc Include the column headers in the column width calculations in BaseGrid 
Originally committed to SVN as r5704.
 2011-10-01 18:35:06 +00:00
Thomas Goyne
3dc0ed6c56 Use CmdDown in BaseGrid rather than #ifdefs 
Originally committed to SVN as r5703.
 2011-10-01 18:35:00 +00:00
Thomas Goyne
c199bd6d18 Only forward scroll wheel events to siblings and not parents to work around wx weirdness 
Originally committed to SVN as r5702.
 2011-10-01 18:34:49 +00:00
Thomas Goyne
5be401a1de Rename edit/search_replace to edit/find_replace for consistency 
Originally committed to SVN as r5701.
 2011-09-30 23:51:41 +00:00
Thomas Goyne
76467584bb Rearrange FrameMain's constructor so that the frame is shown before the updates check and files are loaded. Fixes some ugliness and a bug where the detached video dialog wasn't being parented correctly 
Originally committed to SVN as r5700.
 2011-09-30 20:43:04 +00:00
Thomas Goyne
e2ea5598fc Remove a pointless sizer around the video box 
Originally committed to SVN as r5699.
 2011-09-30 20:42:55 +00:00
Thomas Goyne
87290be48e Use Close rather than Destroy when closing the detached video dialog via the command 
Originally committed to SVN as r5698.
 2011-09-30 20:42:46 +00:00
Thomas Goyne
da6a208062 Bind wxEVT_LEFT_DCLICK in VideoDisplay so the cross and drag visual tools work 
Originally committed to SVN as r5697.
 2011-09-30 20:42:37 +00:00
Thomas Goyne
ce1783a868 Fix crash on commit in karaoke mode when autocommit is off 
Originally committed to SVN as r5696.
 2011-09-30 20:42:28 +00:00
Thomas Goyne
529f61e655 Allow overriding the aspect ratio when video is detached 
Originally committed to SVN as r5695.
 2011-09-30 20:42:20 +00:00
Thomas Goyne
3776051f96 Make the karaoke syllable table from aegisub.parse_karaoke_data zero-based for backward compatibility 
Originally committed to SVN as r5694.
 2011-09-30 20:42:09 +00:00
Thomas Goyne
5c75c9f708 Implement the audio scroll commands 
Originally committed to SVN as r5693.
 2011-09-30 20:41:56 +00:00
Thomas Goyne
597dd4bb8e Don't try to detach on video open if the video is already detached 
Originally committed to SVN as r5692.
 2011-09-30 20:41:44 +00:00
Thomas Goyne
bdcc2ec170 Defriend VideoContext and AudioProvider 
Originally committed to SVN as r5691.
 2011-09-30 20:41:33 +00:00
Thomas Goyne
ea2525cd00 Remove unneccesary forward declarations from video_context.h 
Originally committed to SVN as r5690.
 2011-09-30 20:41:22 +00:00
Thomas Goyne
8bda12596a Increase the minimum width of the thumb in the audio display scrollbar 
Originally committed to SVN as r5689.
 2011-09-30 20:41:10 +00:00
Thomas Goyne
8f918a59c2 Add some missing customizable subtitle grid colors to the preferences dialog 
Originally committed to SVN as r5688.
 2011-09-30 20:40:58 +00:00
Thomas Goyne
d5c4a9bec6 Get line start and end marker colors in dialogue mode from options 
Originally committed to SVN as r5687.
 2011-09-30 20:40:44 +00:00
Thomas Goyne
c4544839e9 Explicitly set the size of ColourButton as the default looks somewhat odd with wx trunk 
Originally committed to SVN as r5686.
 2011-09-29 20:27:50 +00:00
Thomas Goyne
546ced012a Fix option names for syntax highlighting colors 
Originally committed to SVN as r5685.
 2011-09-29 20:27:40 +00:00
Thomas Goyne
0f8bafb432 Change default color for the end of line marker in the audio display to blue 
Originally committed to SVN as r5684.
 2011-09-29 20:27:32 +00:00
Thomas Goyne
62181365b9 Default to 25 FPS if there are too few frames in a video to compute the FPS 
Originally committed to SVN as r5683.
 2011-09-29 20:27:23 +00:00
Thomas Goyne
32463efb08 Fix crash when trying to open audio from file with no audio tracks 
Originally committed to SVN as r5682.
 2011-09-29 20:27:13 +00:00
Thomas Goyne
7b1dea1a7a Eliminate flickering when moving the mouse over the karaoke split/join bar 
Originally committed to SVN as r5681.
 2011-09-29 18:17:37 +00:00
Thomas Goyne
ab52f9a441 Move most of the autosave logic to AssFile and only autosave if there's actually been changes since the last autosave 
Originally committed to SVN as r5680.
 2011-09-29 18:17:27 +00:00
Thomas Goyne
00dd477a40 Remove unused method FrameMain::OnSubtitlesSave 
Originally committed to SVN as r5679.
 2011-09-29 18:17:17 +00:00
Thomas Goyne
08307674a0 Make AudioBox responsible for showing and hiding the karaoke bar, and make it shift the subs box down rather than shrink the audio display 
Originally committed to SVN as r5678.
 2011-09-29 05:33:10 +00:00
Thomas Goyne
094a6d081c Move the audio box height management code from FrameMain to AudioBox 
Originally committed to SVN as r5677.
 2011-09-29 05:33:04 +00:00
Thomas Goyne
c211975b65 Remove unused window IDs in AudioBox 
Originally committed to SVN as r5676.
 2011-09-29 05:32:58 +00:00
Thomas Goyne
fca7657e60 Don't let the user drag the audio sash below the bottom of the window as it's rather hard to drag back afterwards 
Originally committed to SVN as r5675.
 2011-09-29 04:38:34 +00:00
Thomas Goyne
a00a3047cb Save and restore the height of the audio display across sessions 
Originally committed to SVN as r5674.
 2011-09-29 04:38:27 +00:00
Thomas Goyne
6beb266c15 Use the end of line marker style for the end marker in karaoke mode rather than the start of line style 
Originally committed to SVN as r5673.
 2011-09-29 04:38:22 +00:00
Thomas Goyne
9b9482b96f Set the subs box's style and size correctly 
Originally committed to SVN as r5672.
 2011-09-29 04:38:15 +00:00
Thomas Goyne
9ad1434f37 Don't rely on ADL for std algorithms called on wxArrayInt as wxArrayInt doesn't always inherit from std::vector 
Originally committed to SVN as r5671.
 2011-09-29 02:33:22 +00:00
Thomas Goyne
34a7f16214 Skip over invalid entries in the MRU file rather than crashing on startup 
Originally committed to SVN as r5670.
 2011-09-29 00:37:18 +00:00
Thomas Goyne
c328bdfa5f Fix typo that resulted in automation macros not being able to set undo points 
Originally committed to SVN as r5669.
 2011-09-29 00:10:22 +00:00
Thomas Goyne
0f605b358f Make the automation dialog resizable 
Originally committed to SVN as r5668.
 2011-09-28 21:38:18 +00:00
Thomas Goyne
6a49b5392d Write MRU data to disk whenever a change is made rather than only on program exit 
Originally committed to SVN as r5667.
 2011-09-28 19:52:46 +00:00
Thomas Goyne
5411a57b3c Add the command name for macros to the information popup in the automation dialog 
Originally committed to SVN as r5666.
 2011-09-28 19:52:37 +00:00
Thomas Goyne
dbca576d50 Require that macros defined in a single script have unique names 
Originally committed to SVN as r5665.
 2011-09-28 19:52:28 +00:00
Thomas Goyne
c632a662b2 Change the naming scheme for lua commands to 'automation/lua/[Script File Name]/[Macro Name]' 
Originally committed to SVN as r5664.
 2011-09-28 19:52:20 +00:00
Thomas Goyne
799c18e22d Remove unused includes in auto4_lua.cpp 
Originally committed to SVN as r5663.
 2011-09-28 19:52:11 +00:00
Thomas Goyne
1e13670c70 Improve error handling in LuaModuleLoader and don't keep trying to load modules after one has been found 
Originally committed to SVN as r5662.
 2011-09-28 19:52:02 +00:00
Thomas Goyne
d3ea9236cf Correct closing audio in FrameMain::OnSubtitlesOpen 
Originally committed to SVN as r5661.
 2011-09-28 19:51:53 +00:00
Thomas Goyne
77d02d269d Eliminate a use of VideoContext::Get in AudioMarkerProviderKeyframes 
Originally committed to SVN as r5660.
 2011-09-28 19:51:44 +00:00
Thomas Goyne
6bf4a95428 Add a subtitles save slot to AudioController which stores the audio URI in the subtitles 
Originally committed to SVN as r5659.
 2011-09-28 19:51:35 +00:00
Thomas Goyne
74ae9189a2 Set ?audio to the path to the currently open audio file 
Originally committed to SVN as r5658.
 2011-09-28 19:51:26 +00:00
Thomas Goyne
9fc0b33cdf Add opened audio files to the audio mru list 
Originally committed to SVN as r5657.
 2011-09-28 19:51:18 +00:00
Thomas Goyne
d863d4379b Implement Audio/Auto/Scroll option 
Originally committed to SVN as r5656.
 2011-09-28 19:51:09 +00:00
Thomas Goyne
976061747d Fix setting of filename when saving the subtitles 
Originally committed to SVN as r5655.
 2011-09-28 19:50:59 +00:00
Thomas Goyne
bfcd76c4aa Add missing #include <algorithm> to scoped_ptr.h 
Originally committed to SVN as r5654.
 2011-09-28 19:50:50 +00:00
Thomas Goyne
5a49abb2eb Fix bug in BaseGrid::GetSelection that resulted in row 0 always being selected 
Originally committed to SVN as r5653.
 2011-09-28 19:50:41 +00:00
Thomas Goyne
bb72ec980e Actually select the new line when a new dialogue line is added due to the user switching to the next line from the edit box 
Originally committed to SVN as r5652.
 2011-09-28 19:50:32 +00:00
Thomas Goyne
94998f4283 Update ths column widths in BaseGrid when the number of digits in the row number changes 
Originally committed to SVN as r5651.
 2011-09-28 19:50:24 +00:00
Thomas Goyne
b55ff3f803 Switch auto4lua to a transactional model which applies changes to the subtitle file only if a macro runs to completion without errors or the user cancelling. Significantly improves behavior when the user cancels and fixes a race condition caused by committing on threads other than the GUI thread. 
Originally committed to SVN as r5650.
 2011-09-28 19:50:14 +00:00
Thomas Goyne
28afc48ca5 Eliminate an uninitialized variable warning 
Originally committed to SVN as r5649.
 2011-09-28 19:50:06 +00:00
Thomas Goyne
d419c7a447 Implement the Automation menu 
Originally committed to SVN as r5648.
 2011-09-28 19:49:56 +00:00
Thomas Goyne
5bb5f146a7 Make the project context available to lua C functions so that they can use that instead of VideoContext::Get() 
Originally committed to SVN as r5647.
 2011-09-28 19:49:47 +00:00
Thomas Goyne
dfef9191f9 Move the creation of the progress dialog for the audio caches to AudioProvider and just pass the BackgroundRunner to the caches. This still isn't the right place to be creating it, but this removes the UI-dependency for both caches. 
Originally committed to SVN as r5646.
 2011-09-28 19:49:37 +00:00
Thomas Goyne
a9dc1f045d Remove "Config" from the name of ScriptConfigDialog and friends as they're used for more than just config, and clean up the implementations. 
Originally committed to SVN as r5645.
 2011-09-28 19:49:27 +00:00
Thomas Goyne
59d11f4cc4 Make it so auto4lua macros can have an IsActive function. Probably not very useful at the moment. 
Originally committed to SVN as r5644.
 2011-09-28 19:49:18 +00:00
Thomas Goyne
60ea67661a Do a better job of setting the module load path in LuaAssFile 
Originally committed to SVN as r5643.
 2011-09-28 19:49:09 +00:00
Thomas Goyne
8ba559b7f7 Clean up Automation4::ScriptManager 
Originally committed to SVN as r5642.
 2011-09-28 19:48:58 +00:00
Thomas Goyne
eec3d64221 Make automation macros standard commands and remove the Automation4::Feature base class as it's no longer a useful abstraction. 
Originally committed to SVN as r5641.
 2011-09-28 19:48:47 +00:00
Thomas Goyne
492a0d3046 Make Automation4::Script mostly pure abstract and clean up the implementation of LuaScript 
Originally committed to SVN as r5640.
 2011-09-28 19:48:37 +00:00
Thomas Goyne
c09259c93d Throw typed exceptions in automation rather than strings 
Originally committed to SVN as r5639.
 2011-09-28 19:48:28 +00:00
Thomas Goyne
6d0e44baad Use LocalScriptManager::Reload rather than looping over the scripts manually in the am/manager command 
Originally committed to SVN as r5638.
 2011-09-28 19:48:20 +00:00
Thomas Goyne
af9315f1aa Remove some lingering unused automation things in frame_main 
Originally committed to SVN as r5637.
 2011-09-28 19:48:11 +00:00
Thomas Goyne
f970508e67 Add the ability to unregister commands and clarify who owns command objects 
Originally committed to SVN as r5636.
 2011-09-28 19:48:02 +00:00
Thomas Goyne
8aca250fd0 Kill cmd::id and friends. It didn't work correctly as ids weren't stable and only VideoBox still used it 
Originally committed to SVN as r5635.
 2011-09-28 19:47:53 +00:00
Thomas Goyne
53b6765dd8 Redesign DialogProgress 
Add agi::ProgressSink and agi::BackgroundRunner interfaces to libaegisub
which represent a generic progress sink and a thing which calls funtions
that need progress sinks. Make DialogProgress implement
agi::BackgroundRunner, invoking the passed function on a worker thread
and giving it a progress sink to update the dialog with.

Rewrite Automation4::ProgressSink, LuaThreadedCall and all related
classes to be based on agi::ProgressSink. Automation now simply uses
DialogProgress (although that's merely an implementation detail) and
adds a single method to route dialog opening from the worker thread to
the GUI thread.

Originally committed to SVN as r5634.
 2011-09-28 19:47:40 +00:00
Thomas Goyne
5439c6dae6 Remove some old video options from default_config.json 
Originally committed to SVN as r5633.
 2011-09-28 19:47:31 +00:00
Thomas Goyne
f341a63f14 Delete all the unused things in MatroskaWrapper (i.e. most of it), fix some derpy things, and make it throw typed exceptions. 
Originally committed to SVN as r5632.
 2011-09-28 19:47:21 +00:00
Thomas Goyne
2ca9392942 Set more finely-grained commit types from LuaAssFile rather than always using COMMIT_NEW 
Originally committed to SVN as r5631.
 2011-09-28 19:47:12 +00:00
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
Thomas Goyne
5a9fe91899 Fix swapped expected and actual values in some of the util tests 
Originally committed to SVN as r5498.
 2011-07-26 19:51:19 +00:00
Thomas Goyne
231adad93f Implement agi::util::freespace for Windows 
Originally committed to SVN as r5497.
 2011-07-26 19:51:07 +00:00
Thomas Goyne
6f22088b06 Update libass include path to not look for the now nonexistant in-repo copy 
Originally committed to SVN as r5494.
 2011-07-20 20:09:03 +00:00
Thomas Goyne
52e60f09dc Fix path to config.h in path.cpp 
Originally committed to SVN as r5493.
 2011-07-20 20:08:51 +00:00
Thomas Goyne
4e0725104d Set default decoding threads for ffms to -1 so that it decides the number automatically 
Originally committed to SVN as r5492.
 2011-07-20 19:17:56 +00:00
Niels Martin Hansen
b60e3a5bd4 Rename another clashing file in libaegisub. 
Originally committed to SVN as r5490.
 2011-07-18 01:08:41 +00:00
Niels Martin Hansen
89b97a55be Update and simplify project files for recent changes. 
Originally committed to SVN as r5489.
 2011-07-18 00:43:38 +00:00
Thomas Goyne
85b46bceff Fix required version of FFMS2 
Originally committed to SVN as r5486.
 2011-07-16 18:43:22 +00:00
Thomas Goyne
72bc33fda3 Fix compilation errors with precompiled headers disabled 
Originally committed to SVN as r5484.
 2011-07-16 06:42:55 +00:00
Thomas Goyne
0616b39ffe Fix a pile of warnings 
Originally committed to SVN as r5483.
 2011-07-16 05:01:36 +00:00
Thomas Goyne
b509cb0be5 s/WITH_/HAVE_ in src/Makefile so that libass and ffms are actually used when present 
Originally committed to SVN as r5482.
 2011-07-16 03:52:30 +00:00
Thomas Goyne
8ccc0acc9d Fix reporter compilation errors 
Originally committed to SVN as r5481.
 2011-07-16 03:36:42 +00:00
Thomas Goyne
eea30df7db Kill in-repo libass and ffms and clean up some old cruft in the configure script 
Originally committed to SVN as r5480.
 2011-07-16 03:36:28 +00:00
Thomas Goyne
da3e7e4d88 Only register the assdraw command on windows when assdraw is present 
Originally committed to SVN as r5479.
 2011-07-15 23:44:03 +00:00
Thomas Goyne
3d22da9fbc Skip invalid commands when constructing the toolbar and menu rather than exploding 
Originally committed to SVN as r5478.
 2011-07-15 23:43:52 +00:00
Thomas Goyne
c32e372dd4 Fix leak of the Options object in agi::Path and potential overwriting of the config file with an out of date version on shutdown 
Originally committed to SVN as r5477.
 2011-07-15 17:36:53 +00:00
Thomas Goyne
26695a8cc8 Eliminate memory leak in menu code 
Originally committed to SVN as r5476.
 2011-07-15 17:36:44 +00:00
Thomas Goyne
5c7a848f21 Delete the menu on shutdown 
Originally committed to SVN as r5475.
 2011-07-15 17:36:35 +00:00
Thomas Goyne
be8d841577 Delete built in export filters on exit 
Originally committed to SVN as r5474.
 2011-07-15 17:36:26 +00:00
Thomas Goyne
faecc3304d Delete all commands on shutdown 
Originally committed to SVN as r5473.
 2011-07-15 17:36:17 +00:00
Thomas Goyne
a8a30d6ac1 Fix hotkey memory leaks 
Originally committed to SVN as r5472.
 2011-07-15 17:36:06 +00:00
Thomas Goyne
1e2abbd45a Fix leak of all icon bitmaps 
Originally committed to SVN as r5471.
 2011-07-15 17:24:05 +00:00
Thomas Goyne
7842ccbeb1 Kill SubtitlesGrid::SetVideoToSubs 
Originally committed to SVN as r5470.
 2011-07-15 04:25:23 +00:00
Thomas Goyne
e75ea7d2e8 Default to 16x16 icons if the requested size is invalid 
The options system currently doesn't support constraints beyond those
forced by the type system, making it easy to set the icon size to a
value which would make it impossible to get to the preferences dialog to
fix it.

Originally committed to SVN as r5469.
 2011-07-15 04:06:29 +00:00
Thomas Goyne
88f0659307 Rewrite the toolbar generation code 
The old toolbar code didn't actually support any nontrivial
customization of toolbars, as it had a hardcoded list of commands which
would be enabled or disabled, and the checks for enabling/disabling
toolbar buttons was done only in the specific situations which those
commands used.

Make icon size a user customizable option and add support for
dynamically changing it at runtime.

Originally committed to SVN as r5468.
 2011-07-15 04:06:23 +00:00
Thomas Goyne
f4d44f7c18 Move the zoom box from the main toolbar to the video box 
Originally committed to SVN as r5467.
 2011-07-15 04:06:16 +00:00
Thomas Goyne
b93bb888e3 Use IsActive in frame_main 
Originally committed to SVN as r5466.
 2011-07-15 04:06:10 +00:00
Thomas Goyne
2b9d47b9fe Add IsActive method to commands to indicate whether or not a radio/checkbox is currently selected 
Originally committed to SVN as r5465.
 2011-07-15 04:06:03 +00:00
Thomas Goyne
ec2c36c743 Add type flags to commands 
Originally committed to SVN as r5464.
 2011-07-15 04:05:56 +00:00
Thomas Goyne
0af7ae7fca Clean up frame_main a bit 
Delete some pointless comments, move documentation to the header, and
extend it a bit

Sort prototypes in the header

Move event IDs out of the header

Remove a few unused includes

Assorted cosmetic changse

Originally committed to SVN as r5463.
 2011-07-15 04:05:49 +00:00
Thomas Goyne
95cadb5226 Clean up base_grid a bit 
Reduce the visibilty of many members and document some of them

Cut down on recreation of wxPen and wxBrush objects in DrawImage,
probably speeding up painting somewhat

Simplify handling of extendRow

Move event IDs to base_grid.cpp

Remove worthless comments and dead code

Assorted cosmetic changes

Originally committed to SVN as r5462.
 2011-07-15 04:05:43 +00:00
Thomas Goyne
fdb6d108f8 Use agi::Context::Validate for the main frame's menus and toolbar 
Originally committed to SVN as r5461.
 2011-07-15 04:05:37 +00:00
Thomas Goyne
ef4bfb1535 use agi::Context::Validate for subsgrid context menu item validation 
Originally committed to SVN as r5460.
 2011-07-15 04:05:31 +00:00
Thomas Goyne
f098e2fac8 Add an optional Validate method to commands 
Originally committed to SVN as r5459.
 2011-07-15 04:05:22 +00:00
Thomas Goyne
d405b061df Eliminate a lot of unnessesary includes of subs_grid.h 
Originally committed to SVN as r5458.
 2011-07-15 04:05:15 +00:00
Thomas Goyne
1d51dd20d2 Return a const reference from GetSelectedSet rather than copying it on every call 
Originally committed to SVN as r5457.
 2011-07-15 04:05:09 +00:00
Thomas Goyne
2eb4c856e8 Simplify and clean up command management code 
Originally committed to SVN as r5456.
 2011-07-15 04:05:01 +00:00
Thomas Goyne
e6dc86212b Use the active line rather than first selected line in SubsEditBox 
Originally committed to SVN as r5455.
 2011-07-15 04:04:54 +00:00
Thomas Goyne
4d924b3f27 Move line joining from SubtitlesGrid to the commands 
Originally committed to SVN as r5454.
 2011-07-15 04:04:48 +00:00
Thomas Goyne
b25066e3c3 Remove a write-only variable in option.cpp 
Originally committed to SVN as r5453.
 2011-07-15 04:04:42 +00:00
Thomas Goyne
6ec63cdde1 Clean up libaegisub includes 
Remove cajun includes from all public headers and the precompiled header

Add a pile of missing standard library headers used in multiple files
to lagi_pre

Originally committed to SVN as r5452.
 2011-07-15 04:04:34 +00:00
Thomas Goyne
48fbedd25b Remove pointless #pragma onces 
Originally committed to SVN as r5451.
 2011-07-15 04:04:28 +00:00
Thomas Goyne
7e5e82090f Remove incorrect inclusions of config.h in headers 
Originally committed to SVN as r5450.
 2011-07-15 04:04:21 +00:00
Thomas Goyne
256e098aa7 Remove header include order requirements 
Originally committed to SVN as r5449.
 2011-07-15 04:04:13 +00:00
Thomas Goyne
63538d125e Implement lead in/out commands 
Originally committed to SVN as r5448.
 2011-07-15 04:04:07 +00:00
Thomas Goyne
401f026180 Fix crash when detaching video 
Originally committed to SVN as r5447.
 2011-07-15 04:04:01 +00:00
Thomas Goyne
0cb42343e0 Fix the video zoom dropdown 
Originally committed to SVN as r5446.
 2011-07-15 04:03:54 +00:00
Thomas Goyne
9c97544fc5 Temporary hack to make the visual typesetting tool mode hotkeys work 
Originally committed to SVN as r5445.
 2011-07-15 04:03:48 +00:00
Thomas Goyne
3df2885ce5 Temporary hack to make automation macros work 
Originally committed to SVN as r5444.
 2011-07-15 04:03:42 +00:00
Thomas Goyne
b5a02e202e Rename libaegisub/windows/util.cpp so that it's actually used 
Originally committed to SVN as r5443.
 2011-07-15 04:03:36 +00:00
Thomas Goyne
67e9384ef4 Remove a bunch of pointless consts from agi::Path and rename the windows implementation so that it's actually used 
Originally committed to SVN as r5442.
 2011-07-15 04:03:28 +00:00
Niels Martin Hansen
9d1cdab638 Merge rewritten ALSA player from 2.1.9. Closes #1106. 
Not tested for compileability, and should probably also have printf's converted to logging statements.

Originally committed to SVN as r5421.
 2011-06-12 00:45:02 +00:00
Niels Martin Hansen
a98cfb7685 Merge r5409 from 2.1.9, see #1300. 
Originally committed to SVN as r5410.
 2011-06-06 21:12:00 +00:00
Niels Martin Hansen
23510dcac8 Merge kara-templater remember/recall functions from 2.1.9. Updates #1277. 
Originally committed to SVN as r5378.
 2011-04-26 08:42:05 +00:00
Grigori Goronzy
e67b0ea54b wxGTK: do not freeze/thaw the main frame window 
On certain configurations, this is problematic, because windows
sometimes are not thaw()'ed correctly, leading to an interface
that doesn't update. This is a workaround that simply disables all
freeze/thaw on the main frame. I haven't noticed any performance
issues.

Originally committed to SVN as r5373.
 2011-02-23 13:14:48 +00:00
Amar Takhar
d6d06b53eb Add Audio/OSS/Device option required by the OSS audio player. 
Originally committed to SVN as r5372.
 2011-02-23 05:14:25 +00:00
Amar Takhar
c53492edcd Remove <sys/param.h> and <sys/mount.h> from common/util.cpp this stems from my accident involving placing code meant for unix/util.cpp into unix/common.cpp which was partially fixed in r5366. 
Originally committed to SVN as r5371.
 2011-02-23 03:34:23 +00:00
Amar Takhar
96f24d6c25 Move sys/param.h under ifndef _WIN32, I need to be more vigilant against including Unix headers in Windows builds. 
Originally committed to SVN as r5370.
 2011-02-23 03:29:30 +00:00
Amar Takhar
6ee90d4bb1 Add <vector> 
Originally committed to SVN as r5369.
 2011-02-23 03:24:08 +00:00
Grigori Goronzy
28e1acfeba libaegisub: do not free string returned by getenv() 
getenv() returns a string that is part of internal process data and
should never be modified and/or free()'d.

Originally committed to SVN as r5368.
 2011-02-23 00:55:48 +00:00
Grigori Goronzy
066ec3014a libaegisub: use statvfs instead of statfs 
statvfs is the portable POSIX defined interface and is supported on all
major UNIX platforms.

Originally committed to SVN as r5367.
 2011-02-23 00:54:18 +00:00
Karl Blomster
7db22972a7 sys/mount.h and statfs(2) do not exist on windows 
Originally committed to SVN as r5366.
 2011-02-22 19:03:03 +00:00
Karl Blomster
387fbdfdea fix xml parsing error in libaegisub project 
Originally committed to SVN as r5355.
 2011-02-22 01:26:46 +00:00
Niels Martin Hansen
27839f92ac Fix #1018 properly, make sure the colour values are brought into 0-255 range and rounded. 
Originally committed to SVN as r5354.
 2011-02-22 00:54:20 +00:00
Amar Takhar
c0cf0c6a06 Add progress support back to HD Audio Cache with the new ProgressSink from libaegisub. Currently AudioProviderFactory::GetProvider() takes the ProgressSinkFactory however this should probably be moved up to the constructor for AudioProviderFactory. We'll see what the best option is when the others come around it's trivial to change. 
Originally committed to SVN as r5347.
 2011-02-11 03:47:18 +00:00
Amar Takhar
8240d3e6b6 Add util::freespace to check for free space on a path. (with tests) 
Originally committed to SVN as r5346.
 2011-02-10 23:55:59 +00:00
Amar Takhar
bbc0f6f859 Document some utility methods. 
Originally committed to SVN as r5345.
 2011-02-10 02:47:41 +00:00
Amar Takhar
3a1487cf6f Finish removing wx from yuv4mpeg... 
Originally committed to SVN as r5344.
 2011-02-10 02:31:42 +00:00
Amar Takhar
2c6abb9a98 Instead of throwing return 0 for invalid values. This happens anyway if the input is invalid so it makes the most sense to return 0 for invalid ranges. 
Originally committed to SVN as r5343.
 2011-02-10 01:36:25 +00:00
Amar Takhar
ef7b3c04e3 Add <climits> 
Originally committed to SVN as r5342.
 2011-02-10 01:33:34 +00:00
Amar Takhar
106b331cb0 Mostly convert yuv4mpeg.cpp -- a little bit of parsing is left which I will take care of shortly. 
Originally committed to SVN as r5341.
 2011-02-10 01:33:14 +00:00
Amar Takhar
3522c0b4bd Add a strtoi function. (with unit tests) 
Originally committed to SVN as r5340.
 2011-02-10 00:41:15 +00:00
Amar Takhar
6615d3981f Add <locale>. 
Originally committed to SVN as r5339.
 2011-02-09 23:56:24 +00:00
Amar Takhar
453381e613 Add a small test for str_lower. 
Originally committed to SVN as r5338.
 2011-02-09 23:43:57 +00:00
Amar Takhar
c33afffa03 Init agi::log::log. 
Originally committed to SVN as r5337.
 2011-02-09 23:37:18 +00:00
Amar Takhar
34e0eb837d Hand edit the libaegisub vcproj to include common/util.cpp 
Originally committed to SVN as r5336.
 2011-02-09 22:32:51 +00:00
Amar Takhar
75e07c7aa7 Add a short method to make an std::string lowercase. 
Originally committed to SVN as r5335.
 2011-02-09 22:31:44 +00:00
Amar Takhar
6d96457555 Remove "Font/Cache/FontConfig" in lieu of "Cache/FontConfig" and add "Cache/FFmpegSource". 
Originally committed to SVN as r5334.
 2011-02-09 21:57:31 +00:00
Niels Martin Hansen
7638375282 Get rid of a few unused variable warnings. 
Originally committed to SVN as r5333.
 2011-02-09 21:56:10 +00:00
Niels Martin Hansen
bc002d749c Make Windows path.cpp actually build. Still not really tested. 
Originally committed to SVN as r5332.
 2011-02-09 21:55:40 +00:00
Niels Martin Hansen
acbe4bbb34 Add a bunch of new files to the libaegisub msbuild. 
Originally committed to SVN as r5331.
 2011-02-09 21:55:03 +00:00
Amar Takhar
a118487afa Remove cache cleaning code from ffms, I'll eventually write something in libaegisub as we need cache cleaning for other areas too. (debug log, crash logs etc) 
Originally committed to SVN as r5330.
 2011-02-09 21:53:37 +00:00
Amar Takhar
ce912335f1 Fix and de wxify video_manager.cpp. 
Originally committed to SVN as r5329.
 2011-02-09 04:41:40 +00:00
Amar Takhar
7d2594b134 s/Video/FFmpegSourceVideoProvider/, originally I was planning something different now we're moving all media-related code, also add missing GetDecoderName() method which was somehow removed by accident in a previous revision. 
Originally committed to SVN as r5328.
 2011-02-09 04:41:15 +00:00
Amar Takhar
83fd95c605 Some fixes to libmedia/video.h 
Originally committed to SVN as r5327.
 2011-02-09 02:30:48 +00:00
Amar Takhar
ae7d00a57e Fix and de-wxify audio_manager.cpp 
Originally committed to SVN as r5326.
 2011-02-09 02:28:43 +00:00
Amar Takhar
185721837b s/Audio/FFmpegSourceAudioProvider/, originally I was planning something different now we're moving all media-related code, also replace missing public identifier from the class decleration. 
Originally committed to SVN as r5325.
 2011-02-09 02:28:24 +00:00
Amar Takhar
c603c21b86 Print a message to the user and exit(1) if HOME is not set in the users environment. 
Originally committed to SVN as r5324.
 2011-02-08 22:40:55 +00:00
Amar Takhar
436ea23e4c Instantiate agi::Path, I have no idea if this works on windows since my build is still broken and jfs' code is untested. If someone else doesn't get to it I'll see about fixing my build and making it work. (if it's even broken...) 
Originally committed to SVN as r5323.
 2011-02-08 05:05:54 +00:00
Amar Takhar
355ad91105 * Instead of ~ use getenv("HOME") to get the users home directory. 
* Fix Locale() to return P_LOCALE
 * Change data and doc values to P_DATA and P_DOC.

Originally committed to SVN as r5322.
 2011-02-08 04:22:52 +00:00
Amar Takhar
961c1245f7 Remove const in path.cpp (missed in r5320) 
Originally committed to SVN as r5321.
 2011-02-08 03:53:34 +00:00
Amar Takhar
bf05289495 * Remove misplaced const on a void method. 
* Forward declare Options to avoid including options.h in the header.

Originally committed to SVN as r5320.
 2011-02-08 03:48:00 +00:00
Niels Martin Hansen
7ae6e6da88 Completely untested implementation of agi::Path for Windows. 
Originally committed to SVN as r5319.
 2011-02-08 00:21:42 +00:00
Amar Takhar
78ed8e3694 Add stub path file for Windows and hand-edit vcproj to include the file. 
Originally committed to SVN as r5318.
 2011-02-07 18:02:26 +00:00
Amar Takhar
b3c5bb6e92 Add corrected default_path.json which should have been in r5315. 
Originally committed to SVN as r5317.
 2011-02-07 18:02:04 +00:00
Amar Takhar
0a54e9ca06 Fix inclusion of config.h, when I was writing this I added a relative path directly to acconf.h 
Originally committed to SVN as r5316.
 2011-02-07 17:36:24 +00:00
Amar Takhar
a35962923f Finish agi::Path so we can actually use it, our current path system is brutal and I needed this for libmedia. I'll be adding OS X support shortly: someone else will have to figure out what to do with windows it's completely trivial see unix/path.cpp and check libaegisub/path.h for the return values. 
Originally committed to SVN as r5315.
 2011-02-07 16:39:49 +00:00
Amar Takhar
7b06c334aa Add missing headers and change StdioProgressSink() to use std::cout and friends. 
Originally committed to SVN as r5314.
 2011-02-07 00:46:49 +00:00
Amar Takhar
e27c3e15b8 Add several progress factories to handle progress bars. The GUI version will come from code within aegisub. 
Originally committed to SVN as r5313.
 2011-02-07 00:12:57 +00:00
Amar Takhar
73913fb0b8 Remove mutex.h from common/log.cpp until the windows build is fixed. 
Originally committed to SVN as r5312.
 2011-02-06 20:45:46 +00:00
Amar Takhar
874950382c s/acconf.h/config.h/ -- I forgot I actually fixed this when adding mutex.h so it was already working with the exception of the namespace change. 
Originally committed to SVN as r5311.
 2011-02-06 20:19:25 +00:00
Amar Takhar
4968fc2b55 Fix ram audio provider: this uses mutex.h (from google) in libaegisub and switches to use agi::io. The progress code has been stubbed out as well as a few path methods. There's no reason to guess at fixing them the only way to do it is after it's actually put into use. 
Originally committed to SVN as r5310.
 2011-02-06 19:52:50 +00:00
Amar Takhar
2edbc8c8c1 Fix mutex.h so we can actually use it. 
Originally committed to SVN as r5309.
 2011-02-06 19:50:59 +00:00
Amar Takhar
3d460ca31f Fix video cache, just needed to stub out one option which will be made a param to the constructor. 
Originally committed to SVN as r5308.
 2011-02-06 19:28:17 +00:00
Amar Takhar
15dab81b91 Fix ram audio provider (this stubs out a few lines used for progress updating. 
Originally committed to SVN as r5307.
 2011-02-06 18:48:42 +00:00
Amar Takhar
2ce135b612 Copy colourspace.(c|h) into libmedia and hack out wx. 
Originally committed to SVN as r5306.
 2011-02-06 03:59:13 +00:00
Amar Takhar
0c15005cc2 Add files to media namespace. 
Originally committed to SVN as r5305.
 2011-02-06 03:32:18 +00:00
Amar Takhar
37bcd0cc12 Fix dummy and pcm audio providers. 
Originally committed to SVN as r5304.
 2011-02-06 03:14:18 +00:00
Amar Takhar
65d216e60d Move dummy.h to dummy_audio.h 
Originally committed to SVN as r5303.
 2011-02-06 03:10:34 +00:00
Amar Takhar
f16fb6bb5f Add fix convert and downmix audio providers. 
Originally committed to SVN as r5302.
 2011-02-06 03:09:59 +00:00
Amar Takhar
e55ad2ed4d Add files to media namespace 
Originally committed to SVN as r5301.
 2011-02-06 03:08:51 +00:00
Amar Takhar
e18ad3768b Switch namespace to media and use VideoProvider 
Originally committed to SVN as r5300.
 2011-02-06 03:02:45 +00:00
Amar Takhar
0ca6266c86 Add missing } to close the namespace. 
Originally committed to SVN as r5299.
 2011-02-06 03:02:13 +00:00
Amar Takhar
f8b4b30cf8 Various fixes: 
* svn:ignore
 * rename 'agi' namespace to 'media'
 * Remove some hacks required before bringing in provider code.

Originally committed to SVN as r5298.
 2011-02-06 02:58:49 +00:00
Amar Takhar
97abbf13ce Remove exception.h, this used to be media.h in libaegisub however it's become moot after bringing in the provider headers from aegisub. 
Originally committed to SVN as r5297.
 2011-02-06 02:57:47 +00:00
Amar Takhar
f486f8dea8 Commit missed changes to libaegisub/Makefile to remove media code. 
Originally committed to SVN as r5296.
 2011-02-06 00:07:19 +00:00
Amar Takhar
ff602f7f2a Copy aegisub/(video|audio)_provider.h to libmedia/(video|audio).h 
Originally committed to SVN as r5295.
 2011-02-06 00:04:55 +00:00
Amar Takhar
7a13a4fb10 Add Makefile, the precompiled header unfortunatly snuck into r5292 -- it's a verbatim copy from libaegisub. 
Originally committed to SVN as r5294.
 2011-02-05 23:49:26 +00:00
Amar Takhar
66b6fdcfc8 Move video_frame.cpp which was left out of r5292. 
Originally committed to SVN as r5293.
 2011-02-05 23:46:09 +00:00
Amar Takhar
511b37ee48 Move converted code out of libaegisub and into libmedia. 
Originally committed to SVN as r5292.
 2011-02-05 23:43:20 +00:00
Amar Takhar
72211ad685 Copy and rename files from src/ into libmedia/. A lot of these headers will have to go into include/*. At the moment there's no point sorting that out until we see the final relation and external api requirements. I'll first unhook all of this code from the UI to figure out what common changes are required then design the final changes for an api that the UI can use sanely. 
Originally committed to SVN as r5290.
 2011-02-05 23:34:12 +00:00
Amar Takhar
7508420000 Commit a WIP for fixing tinderbox distfile building. 
Originally committed to SVN as r5287.
 2011-02-05 22:23:31 +00:00
Amar Takhar
75711f8041 Add FFMPEG LDFLAGS to the reporter as now they're r equired to link libaegisub. It's not worth considering to split it until everything is moved over. 
Originally committed to SVN as r5286.
 2011-02-04 18:41:52 +00:00
Amar Takhar
ac2c6508dd Strategically place comments to stub out AskForTrackSelection() and CleanCache(). 
Originally committed to SVN as r5285.
 2011-02-03 18:12:42 +00:00
Amar Takhar
283eff76ac Add LDFLAGS_POST to the shared library target. 
Originally committed to SVN as r5284.
 2011-02-03 18:09:08 +00:00
Amar Takhar
d59e0dd075 Add support for removing ffms support and properly link ffms into libaegisub. 
Originally committed to SVN as r5283.
 2011-02-03 18:08:41 +00:00
Amar Takhar
e46f83e672 Add -fPIC so ffms can be linked into a shared library. 
Originally committed to SVN as r5282.
 2011-02-03 18:08:11 +00:00
Amar Takhar
a733260603 Add missing headers. 
Originally committed to SVN as r5281.
 2011-02-03 17:15:38 +00:00
Amar Takhar
ac70f229dc Re-license video_frame.(cpp|h) with permission of copyright holder (Rodrigo Braz Monteiro). 
Originally committed to SVN as r5280.
 2011-02-03 15:52:06 +00:00
Amar Takhar
ffff58d698 Compilation fixes now that ffmpegsource_common.cpp has been moved over. Everything compiles correctly now. 
Originally committed to SVN as r5279.
 2011-02-03 15:49:44 +00:00
Amar Takhar
b47dd1e220 Add mid() template to util namespace. 
Originally committed to SVN as r5278.
 2011-02-03 15:49:13 +00:00
Amar Takhar
bb4aa727d3 Add media/* to the build on Unix. 
Originally committed to SVN as r5277.
 2011-02-03 15:48:46 +00:00
Amar Takhar
36549ff724 Add media.h -- I'm not sure if this will be the perm name, it currently holds exception definitions. 
Originally committed to SVN as r5276.
 2011-02-03 15:48:18 +00:00
Amar Takhar
93ceb59b0f Move ffmpegsource_common.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5275.
 2011-02-03 15:47:43 +00:00
Amar Takhar
bcafbe2083 Move ffms_* files over to media/ 
Originally committed to SVN as r5274.
 2011-02-03 01:18:43 +00:00
Amar Takhar
629b819e37 Move video_frame.(cpp|h) to libaegisub. The license has not been changed however I have an email sent to amz, I will change it once he responds. 
Originally committed to SVN as r5273.
 2011-02-03 01:18:14 +00:00
Amar Takhar
f5308fe65b Move video_provider_ffmpegsource.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5272.
 2011-02-03 01:17:15 +00:00
Amar Takhar
cddfe3ed20 Wrap code under the agi namespace. 
Originally committed to SVN as r5271.
 2011-02-02 23:23:48 +00:00
Amar Takhar
cacc3516c1 This should have gone into r5269: These files were re-licensed with permission of the original author. (Karl Blomster). 
Originally committed to SVN as r5270.
 2011-02-02 23:20:03 +00:00
Amar Takhar
1219b069b1 Copy audio_provider_ffmpegsource.(cpp|h) to ./ffms_audio.(cpp|h) and remove wx usage.. The plan is to move a/v support to libaegisub and write unit tests to make sure we can open/close/seek the "official" formats we want to support. 
Originally committed to SVN as r5269.
 2011-02-02 23:11:17 +00:00
Thomas Goyne
b3562eb917 Implement the overscan mask command 
Originally committed to SVN as r5268.
 2011-01-25 04:24:19 +00:00
Thomas Goyne
95c45b3102 Remove pointless #pragma once from video_box.h 
Originally committed to SVN as r5267.
 2011-01-23 07:48:15 +00:00
Thomas Goyne
8d968e4dd5 Move the code for updating the time/frame display boxes from VideoDisplay to VideoBox 
Originally committed to SVN as r5266.
 2011-01-23 07:48:07 +00:00
Thomas Goyne
091c8170f2 Make several of VideoDisplay's members private 
Originally committed to SVN as r5265.
 2011-01-23 07:47:59 +00:00
Thomas Goyne
14420102e4 Update the frame number display and visual typesetting tool when opening a new video 
Originally committed to SVN as r5264.
 2011-01-23 07:47:52 +00:00
Thomas Goyne
10c3a2ca16 Only bind wxEVT_COMMAND_MENU_SELECTED once rather than once per command as large numbers of event handlers make wx explode 
Originally committed to SVN as r5263.
 2011-01-23 06:45:03 +00:00