mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
3897 commits 10 branches 31 tags 51 MiB
Commit graph

802 commits

Author SHA1 Message Date
Thomas Goyne
8756dc1800 Add copy constructor to AssDialogue and use it in Clone 
Originally committed to SVN as r4561.
 2010-06-22 00:03:11 +00:00
Thomas Goyne
fe9aa56d10 Remove pointless IntSwap function from utils.h 
Originally committed to SVN as r4560.
 2010-06-22 00:03:03 +00:00
Niels Martin Hansen
e5eb91a269 * Fix bug in SRT parsing: In some cases a blank line too much is counted. 
* Make SRT no longer coalesce line breaks, Aegisub will now write SRT files with blank lines in subtitles.
Updates #1213.

Originally committed to SVN as r4558.
 2010-06-20 19:42:13 +00:00
Niels Martin Hansen
2fc8420ee9 Rewrite SRT parsing to use more flexible algorithm, allow more freeform files. Updates #1213. 
Originally committed to SVN as r4557.
 2010-06-20 19:07:43 +00:00
Niels Martin Hansen
4c01f9a36b Declare a SubtitleFormatParseError exception, its ancestry might not be final yet. (I'm thinking it needs a file format error class as base, which in turn inherits from agi::InvalidInput.) Updates #1213 in preparation for the actual patch. 
Originally committed to SVN as r4556.
 2010-06-20 19:04:58 +00:00
Niels Martin Hansen
5bd0981a72 Make AssFile::Load catch agi::Exception and report it properly. The catching of reading/parsing errors probably doesn't really belong there, but just making things work for now. Updates #1213 in preparation for the actual patch. 
Originally committed to SVN as r4555.
 2010-06-20 19:03:05 +00:00
Thomas Goyne
363198b2fa Add missing config:: in windows-specific code and move appname setting back before config file loading 
Originally committed to SVN as r4549.
 2010-06-18 07:23:17 +00:00
Thomas Goyne
cfa1758d2a Improve the handling of selected features in the vector clip tool and moderately improve performance 
Originally committed to SVN as r4548.
 2010-06-18 07:14:23 +00:00
Thomas Goyne
227f6b1d69 In the vector clip tool, draw the line to be inserted between the right points when there are multiple paths in the clip 
Originally committed to SVN as r4547.
 2010-06-18 07:14:17 +00:00
Thomas Goyne
6830fbe1ba Fix bug where the color spectrum sometimes would not repaint when it changed 
Originally committed to SVN as r4546.
 2010-06-18 07:14:11 +00:00
Thomas Goyne
3376a2d76a Always repaint the video display when the mouse enters it if visual tools are only shown on mouseover 
Originally committed to SVN as r4545.
 2010-06-18 07:14:06 +00:00
Thomas Goyne
961365dfff Make rotation and scale tools set all selected lines rather than just the active one 
Originally committed to SVN as r4544.
 2010-06-18 07:14:00 +00:00
Amar Takhar
8ee9737b6f Move mru,opt objects out of the main singleton and into a global config:: namespace. With exception of the log object these are initialised during startup to ensure they are initalised after the log object. 
Originally committed to SVN as r4538.
 2010-06-18 02:23:27 +00:00
Thomas Goyne
d6b68dfb25 Kill VideoContext::Refresh's arguments; one has never actually done anything and the other is the same in all places where Refresh is called. 
Originally committed to SVN as r4528.
 2010-06-16 06:20:39 +00:00
Thomas Goyne
faf2e562cd Rename FrameMain::SubsBox to SubsGrid for consistency with the rest of Aegisub. 
Originally committed to SVN as r4527.
 2010-06-16 06:20:33 +00:00
Thomas Goyne
43f3502043 Eliminate double inclusion of frame_main.h and remove #pragma once 
Originally committed to SVN as r4526.
 2010-06-16 06:20:27 +00:00
Thomas Goyne
392ce99083 Kill AssDialogue::UpdateData, which last had a non-empty body 3.5 years ago 
Originally committed to SVN as r4525.
 2010-06-16 06:20:19 +00:00
Thomas Goyne
8086fae633 Document AssFile's public methods 
Originally committed to SVN as r4524.
 2010-06-16 06:20:14 +00:00
Thomas Goyne
166c95975b Templatize VariableData's getters and setters 
Originally committed to SVN as r4523.
 2010-06-16 06:20:06 +00:00
Thomas Goyne
c7ea710267 Use VideoContext::JumpToTime where appropriate 
Originally committed to SVN as r4522.
 2010-06-16 06:19:49 +00:00
Thomas Goyne
5338a60cdb Fix compilation errors when not using precompiled headers 
Originally committed to SVN as r4511.
 2010-06-14 19:26:27 +00:00
Amar Takhar
461616a47f Hook up default_path.json to the build 
Originally committed to SVN as r4491.
 2010-06-13 01:43:19 +00:00
Amar Takhar
f497144525 Fix syntax errors 
Originally committed to SVN as r4490.
 2010-06-13 01:42:50 +00:00
Amar Takhar
c95eb3fcce universalchardet is no longer optional. 
Originally committed to SVN as r4481.
 2010-06-12 05:29:01 +00:00
Thomas Goyne
ccdc863496 Fix copy/paste error in r4244 
Originally committed to SVN as r4479.
 2010-06-11 02:25:40 +00:00
Thomas Goyne
40da39e1c8 Make updating the subtitle preview window roughly 50% faster 
Originally committed to SVN as r4478.
 2010-06-11 02:25:34 +00:00
Thomas Goyne
4ef9d41601 Don't require that subtitles passed to SubtitlesProvider::LoadSubtitles be a copy that can be deleted 
Originally committed to SVN as r4477.
 2010-06-11 02:25:28 +00:00
Thomas Goyne
72cbf4939f Fix flickering in color picker 
Originally committed to SVN as r4476.
 2010-06-11 02:25:23 +00:00
Thomas Goyne
c290b6b811 Silence some prefast warnings 
Originally committed to SVN as r4472.
 2010-06-11 02:24:59 +00:00
Amar Takhar
bc40eeb827 Don't use a wxChar for exception messages. 
Originally committed to SVN as r4471.
 2010-06-10 04:52:47 +00:00
Amar Takhar
2c703a3baa Remove instances of ^USER and swap them with ^CONFIG, ^USER will still exist but won't be in the default config. Also add 'last opened' paths. 
Originally committed to SVN as r4470.
 2010-06-09 23:45:05 +00:00
Thomas Goyne
d278c99652 Make the color picker dialog update the color instantly when used from the style editor, rather than waiting for the dialog to be closed, and revert if the dialog is cancelled. Updates #355. 
Originally committed to SVN as r4469.
 2010-06-09 08:14:50 +00:00
Amar Takhar
9a3e1c58f0 Use an std::string for now when printing messages. 
Originally committed to SVN as r4467.
 2010-06-09 02:06:37 +00:00
Amar Takhar
931cc7f461 * Remove all instances of wxLogDebug and replace them with LOG_W, LOG_D, LOG_E and LOG_D_IF as required. 
* Add LOG_(D|W|I)_IF for conditional logging.

Originally committed to SVN as r4465.
 2010-06-08 23:21:39 +00:00
Amar Takhar
653ce8b13d Fix misspelled option name 
Originally committed to SVN as r4464.
 2010-06-08 12:07:56 +00:00
Thomas Goyne
f361d1a67b Add support for rendering vector clips with multiple 'm' commands. 
Originally committed to SVN as r4463.
 2010-06-08 06:09:19 +00:00
Thomas Goyne
c7da8d9f61 Store OptionValues used by VideoContext 
Originally committed to SVN as r4462.
 2010-06-08 06:09:13 +00:00
Thomas Goyne
a12ec002c6 Fix crash when framestepping caused by an incorrect option name. 
Originally committed to SVN as r4461.
 2010-06-08 06:09:08 +00:00
Thomas Goyne
ae099a3363 Vector clip tool always needs to repaint in modes 1-4. 
Originally committed to SVN as r4460.
 2010-06-08 06:09:02 +00:00
Thomas Goyne
b867eec7f3 Make the vector clip visual tool use vertex arrays rather than immediate mode to render the spline 
Originally committed to SVN as r4458.
 2010-06-07 07:24:43 +00:00
Thomas Goyne
fae2af36fc Only draw the line to the cursor in the rotatez tool if the cursor is over the video display. 
Originally committed to SVN as r4457.
 2010-06-07 07:24:37 +00:00
Thomas Goyne
83e35ac63d Only rerender the video display on mouse events if display will actually change 
Originally committed to SVN as r4456.
 2010-06-07 07:24:30 +00:00
Thomas Goyne
1b27b77ac3 Add glext.h to the precompiled header 
Originally committed to SVN as r4455.
 2010-06-07 07:24:25 +00:00
Thomas Goyne
303f4990a5 Update glext.h to a version that isn't four years old 
Originally committed to SVN as r4454.
 2010-06-07 07:24:18 +00:00
Amar Takhar
ad0241e3df Add default_menu.json for safe keeping, I'm not sure if this is the final format.. whatever it ends up being this will be close. 
Originally committed to SVN as r4453.
 2010-06-07 06:40:19 +00:00
Thomas Goyne
3fbdf5b7e5 Make the vector clip tool mask based on winding number so that the masking matches VSFilter's clipping. 
Originally committed to SVN as r4442.
 2010-06-05 22:40:16 +00:00
Niels Martin Hansen
ff34a08afd Make update checker use a compile-time list of tags to determine the appropriate updates to list, instead of a hard-coded OS check. The list of accepted tags is defined by the UPDATE_CHECKER_ACCEPT_TAGS macro. If this macro is undefined, the update checker will still compile, but will reject all updates with tags. 
Updates #1132.

Originally committed to SVN as r4440.
 2010-06-05 20:16:30 +00:00
Amar Takhar
083f1175a6 Remove iconv library dependency as this is brought in from libaegisub. 
Originally committed to SVN as r4432.
 2010-06-04 12:59:49 +00:00
Thomas Goyne
eff4dcf404 Fix might-as-well-be-inifinite loop in VisualToolVectorClip 
Originally committed to SVN as r4431.
 2010-06-04 03:08:10 +00:00
Thomas Goyne
38d922c57a Remove time-consuming reparsing of the line in VisualTool::SetOverride 
Originally committed to SVN as r4430.
 2010-06-04 03:08:04 +00:00
Thomas Goyne
88f6bca9d7 Make ASS tag parsing ~50% faster. 
Originally committed to SVN as r4429.
 2010-06-04 03:07:58 +00:00
Thomas Goyne
f001651865 Replace AssDialogueBlock::GetAsOverride etc. with dynamic_cast 
Originally committed to SVN as r4428.
 2010-06-04 03:07:52 +00:00
Thomas Goyne
fe65f778b1 Don't set the line color for every visual feature as it's always the same 
Originally committed to SVN as r4427.
 2010-06-04 03:07:46 +00:00
Thomas Goyne
2659b79036 Update the edit box less often during visual tool drags, making drags ~20% faster. 
Originally committed to SVN as r4426.
 2010-06-04 03:07:41 +00:00
Thomas Goyne
625ce943f5 Cache OptionValue objects used by the video display 
Originally committed to SVN as r4425.
 2010-06-04 03:07:33 +00:00
Thomas Goyne
3d04db9e90 Fix build error when wx was not built with wxUSE_STL 
Originally committed to SVN as r4424.
 2010-06-03 20:54:46 +00:00
Thomas Goyne
b6d29443a3 Move most character set conversion code to libaegisub and make everything use the new conversion functionality. 
Originally committed to SVN as r4423.
 2010-06-03 20:32:25 +00:00
Thomas Goyne
7337a11745 Explicitly set the charset to binary when loading subtitles from the video 
Originally committed to SVN as r4422.
 2010-06-03 20:32:17 +00:00
Thomas Goyne
71300869da Fix order that VisualToolVectorClip's members are initialized 
Originally committed to SVN as r4421.
 2010-06-03 20:32:10 +00:00
Thomas Goyne
ca24f60a7e Fix memory leak when exporting a file fails 
Originally committed to SVN as r4420.
 2010-06-03 20:32:03 +00:00
Thomas Goyne
f064624ecd Simplify charset detection 
Originally committed to SVN as r4419.
 2010-06-03 20:31:43 +00:00
Thomas Goyne
90893f1048 Make the capitalization of FFmpegSource in options consistent, as option names are now case-sensitive. 
Originally committed to SVN as r4414.
 2010-06-03 05:07:10 +00:00
Amar Takhar
2d1bea39cf * Change wxID_CLOSE to wxID_OK 
* Destroy the dialogue when closed
 * Don't delete *sink.

Originally committed to SVN as r4413.
 2010-06-03 03:07:43 +00:00
Amar Takhar
2e156b8c4f Add a temp stub to dialog_log.cpp to get it building on windows. This still has memory issues which I'll fix along with a new util function to get localtime_r() data on windows+unix. 
Originally committed to SVN as r4412.
 2010-06-03 01:22:02 +00:00
Amar Takhar
719b7c2281 Add a basic "log window", this will be more polished and useful later on for now it's just something quick and dirty. 
There are a few issues to fix:
 * Delete the pointer in frame_main from the modless dialog.
 * Fix string storage in the logging class.
 * Close button doesn't work.

Originally committed to SVN as r4406.
 2010-06-02 23:47:39 +00:00
Thomas Goyne
6c13d8f250 Fix merge error in r4401. 
Originally committed to SVN as r4403.
 2010-06-02 22:54:38 +00:00
Thomas Goyne
9767b715ca Explicitly initialize VisualToolScale's members 
Originally committed to SVN as r4402.
 2010-06-02 07:22:59 +00:00
Thomas Goyne
7bf9e41526 Document gl_text, fix some minor memory leaks and fix a rendering error that happened only in debug builds. 
Originally committed to SVN as r4401.
 2010-06-02 07:22:53 +00:00
Thomas Goyne
fd00cf9a21 Fix bug where visual tools could leave no lines selected. 
Originally committed to SVN as r4400.
 2010-06-02 07:22:48 +00:00
Amar Takhar
d295ce7b0a Convert a bunch of wxLog* to the new logging method. 
Originally committed to SVN as r4399.
 2010-06-01 08:21:30 +00:00
Amar Takhar
002f284bea Fix r4383: trunk doesn't use wxString for exceptions anymore. 
Originally committed to SVN as r4393.
 2010-06-01 07:55:24 +00:00
Thomas Goyne
ac42fcda5d Fix undo problems with cross and drag visual tools. 
Originally committed to SVN as r4388.
 2010-06-01 03:21:25 +00:00
Thomas Goyne
da6c47c20b Load rotation from a line's style when it's not set by an override tag. 
Originally committed to SVN as r4387.
 2010-06-01 03:21:20 +00:00
Thomas Goyne
9e6454a798 Fix a few spots where x and y were swapped in the X/Y rotation tool. 
Originally committed to SVN as r4386.
 2010-06-01 03:21:14 +00:00
Niels Martin Hansen
0fe2071082 Add a null-pointer check to update checker. Updates #1164. 
Originally committed to SVN as r4383.
 2010-06-01 02:08:22 +00:00
Niels Martin Hansen
db3c67cfaf Change description of framerate transform export filter to something more modern. Updates #1069. 
Originally committed to SVN as r4379.
 2010-06-01 00:06:08 +00:00
Amar Takhar
f7993ce3ac Remove the (59!) wxLogDebug lines, this is being rewritten by jfs so there's no point on porting it to the new logging system. 
Originally committed to SVN as r4375.
 2010-05-31 23:04:27 +00:00
Amar Takhar
e7b859b9f7 Switch to using libaegisub for character set detection. There are some bugs here but it seems to be more consistent than the last version. There are two remaining issues left: when the character set is unknown we need to provide a full list to choose from. The second: if the file is detected as US-ASCII we need to give a parse error to the user if we run into problems. Right now we'll load the file fine and disable a lot of options.. with no message to the user. 
Originally committed to SVN as r4370.
 2010-05-29 02:25:19 +00:00
Thomas Goyne
6df5d97568 Eliminate a redundant rerender of the frame when committing changes from 
the visual tools. Makes all visual tools roughly twice as fast when real
time mode is enabled.

Originally committed to SVN as r4365.
 2010-05-26 22:09:00 +00:00
Thomas Goyne
e120ecc190 Make move/pos toggle modify all selected lines 
Originally committed to SVN as r4364.
 2010-05-26 07:17:46 +00:00
Thomas Goyne
877eabdce7 Fix selection issues with visual features 
Selections in drag mode now follow the following rules:

 * If a line is selected in the grid, at least one visual feature
   corresponding to the line is selected.

 * If a line has any features selected, that line is selected in the
   grid.

In addition, all control points now start out selected in the vector
clip tool, and all tools should no longer discard the current selection
at unpredictable or unintended times.

Updates #513.

Originally committed to SVN as r4363.
 2010-05-26 07:17:39 +00:00
Thomas Goyne
d2a81d871b Make several methods in BaseGrid static or const and clean up some of the implementations. 
Originally committed to SVN as r4362.
 2010-05-26 07:17:34 +00:00
Thomas Goyne
acc1e93728 Also update origins when setting multiple lines with the drag tool. Updates #513 
Originally committed to SVN as r4361.
 2010-05-26 07:17:28 +00:00
Thomas Goyne
5283c1527b Add updating multiple lines at once to the cross visual tool and make it only happen if alt is held down in both cross and drag. Updates #513. 
Originally committed to SVN as r4360.
 2010-05-26 07:17:15 +00:00
Amar Takhar
2d57debd49 Commit the beginings of the Path class to hold the internal representation of paths, this is extremely rough since I have to wait until we can do charset conversion in libaegisub to handle windows paths before going any further. 
Originally committed to SVN as r4359.
 2010-05-24 17:57:07 +00:00
Grigori Goronzy
e9c806d0de Handle libass messages with wxLog* family of functions 
Originally committed to SVN as r4357.
 2010-05-24 03:41:06 +00:00
Grigori Goronzy
61ab7d1f2c Fix ALSA player compilation. (missing includes) 
Originally committed to SVN as r4355.
 2010-05-24 01:46:04 +00:00
Thomas Goyne
1e975eee89 Add double-click positioning to drag visual tool. 
Sets the last clicked-on feature to the double-clicked spot and applies
the same relative movement to all other selected lines (including ones
not visible on the current frame).

Updates #513.

Originally committed to SVN as r4350.
 2010-05-23 08:53:27 +00:00
Thomas Goyne
d5df0fd545 Fix incorrect setting of float values in the style editor introduced in 7a29bffb847ce2e2f877ddf773aec4afb821018b 
Originally committed to SVN as r4346.
 2010-05-23 06:57:54 +00:00
Thomas Goyne
9157465a18 Fix loading video/keyframes/timecodes from the MRU list. 
Originally committed to SVN as r4338.
 2010-05-21 04:40:38 +00:00
Thomas Goyne
68914197d5 Re-add local config file support for standalone installations. 
Originally committed to SVN as r4335.
 2010-05-21 03:52:11 +00:00
Amar Takhar
40e12403d5 Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. 
Initial support for low-level access and file I/O methods are included as well.

Originally committed to SVN as r4331.
 2010-05-21 01:13:36 +00:00
Thomas Goyne
23972b10bc Add selection and control of multiple visual features 
Make all visual tools support selecting and manipulating multiple visual
features at once, allowing multiple lines to be moved at once, entire
vector clips to be translated, etc. Controls:

  - Left click: Select control clicked control only
  - Ctrl-left click: Add/remove control to selection
  - Drag control (with or without ctrl): Move all selected controls,
    after setting/adding to selection if target is not in the selection
  - Click on no control: Clear selection

Lots of little stuff to fix still.

Updates #513.

Originally committed to SVN as r4322.
 2010-05-20 08:55:58 +00:00
Thomas Goyne
8ff2728322 Move all userdata in VisualDraggableFeature not used by VisualTool to subclasses specific to each tool that needs userdata. 
Originally committed to SVN as r4321.
 2010-05-20 08:55:52 +00:00
Thomas Goyne
a282393b47 Template VisualTool on the type of draggable features to use 
Originally committed to SVN as r4320.
 2010-05-20 08:55:46 +00:00
Thomas Goyne
2ef8302a6d Add boost/shared_pointer.hpp to the precompiled header 
Originally committed to SVN as r4319.
 2010-05-20 08:55:41 +00:00
Thomas Goyne
40a0c8994a Simplify the VisualTool interface a bit. 
Originally committed to SVN as r4318.
 2010-05-20 08:55:35 +00:00
Thomas Goyne
e023831134 Detangle the visual tools from SubsEditBox a bit by making changes to the file no longer go through the edit box. 
Originally committed to SVN as r4317.
 2010-05-20 08:55:29 +00:00
Thomas Goyne
34a7d21a42 Kill the redundant VisualToolEvent nonsense and make the drag tool just use OnSubTool like the vector clip mode. 
Originally committed to SVN as r4316.
 2010-05-20 08:55:23 +00:00
Thomas Goyne
2ec4a97dbb Fix bad coordinate conversion in the clip visual tool 
Originally committed to SVN as r4315.
 2010-05-20 08:55:18 +00:00