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