Thomas Goyne
75d9ecd14a
Fix selection issues with visual tools
...
Originally committed to SVN as r4622.
2010-06-27 07:53:25 +00:00
Thomas Goyne
7f7771bcdc
Remove unused variables
...
Originally committed to SVN as r4621.
2010-06-27 07:53:20 +00:00
Thomas Goyne
caba46bf0b
Remove features for deleted control points
...
Originally committed to SVN as r4620.
2010-06-27 07:53:14 +00:00
Thomas Goyne
dc2836e9e5
Fix bug where features for the wrong line were displayed in the rectangular clip tool
...
Originally committed to SVN as r4619.
2010-06-27 07:53:08 +00:00
Thomas Goyne
44888bb008
Reenable Start/Cancel buttons in the font collector dialog even if the collection fails.
...
Originally committed to SVN as r4618.
2010-06-27 05:05:44 +00:00
Thomas Goyne
7c4bf32566
Don't allow deselection of the only selected line
...
Originally committed to SVN as r4617.
2010-06-27 04:55:19 +00:00
Thomas Goyne
11b30c8bb4
When the active line is deselected via ctrl-clicking, set the active line to a line which is selected.
...
Originally committed to SVN as r4616.
2010-06-27 04:55:14 +00:00
Thomas Goyne
74d887a4c4
Add ctrl-shift-click block selection adding
...
Originally committed to SVN as r4615.
2010-06-27 04:55:08 +00:00
Thomas Goyne
2f80c6b26a
Update lastRow when rows are ctrl-clicked
...
Originally committed to SVN as r4614.
2010-06-27 04:55:03 +00:00
Thomas Goyne
a47080137d
Repaint rows when they are added or removed from the selection
...
Originally committed to SVN as r4613.
2010-06-27 04:54:58 +00:00
Thomas Goyne
4db892935c
Remove redundant handler for ctrl-clicking the grid
...
Originally committed to SVN as r4612.
2010-06-27 04:54:52 +00:00
Thomas Goyne
934da32931
Select the first line when opening a file
...
Originally committed to SVN as r4611.
2010-06-27 04:54:46 +00:00
Thomas Goyne
5598b787c7
Fix gcc build errors
...
Originally committed to SVN as r4610.
2010-06-27 03:24:03 +00:00
Niels Martin Hansen
c5c306f90c
Make SubtitlesGrid::InsertLine() smarter about updating maps, saves quite a lot of time on big insertions.
...
Originally committed to SVN as r4609.
2010-06-26 15:49:05 +00:00
Niels Martin Hansen
22de62de77
Add selection change notification batching to the grid. This doesn't seem to actually improve performance, it might rather be line inserts that are glacial.
...
Originally committed to SVN as r4608.
2010-06-26 15:40:10 +00:00
Niels Martin Hansen
4c604931aa
Fix mistake in DummySelectionController template class, should make G++ a little happier.
...
Originally committed to SVN as r4607.
2010-06-26 14:26:38 +00:00
Niels Martin Hansen
52627a0fc5
Show splash screen much earlier, and show main window much later. Also be smoother about the display of the main window, avoid flickery relayouting. Remove splash screen "click to close" behaviour as well as timed close, just hide it when the main window has been shown.
...
Originally committed to SVN as r4606.
2010-06-26 14:16:59 +00:00
Niels Martin Hansen
c15f0ada62
Be more sure the audio display's grid pointer is initialised properly. Should fix audio loading.
...
Originally committed to SVN as r4605.
2010-06-26 14:09:15 +00:00
Niels Martin Hansen
c9c2fa6404
Move "active line" responsibility to the grid. There are at the very least a bunch of redraw issues that need to be sorted out, probably much worse things are hiding.
...
Originally committed to SVN as r4604.
2010-06-26 11:32:16 +00:00
Niels Martin Hansen
c4a27da4fc
Change the grid to use more sensible maps to keep track of index/object mappings for subtitle lines, and follow the SelectionController model. (Hopefully the new maps can also give slightly better performance.)
...
Try to keep the original API intact. Some redundant or unused functions in SubtitleGrid were removed. The LoadFromAss() function was renamed to UpdateMaps() since that was its real purpose. (Note that SubtitleGrid now has an UpdateMaps() function that overshadows BaseGrid::UpdateMaps(), but SubtitleGrid::UpdateMaps() calls the hidden function. They are not virtual.)
This does not yet fix visual tool feature selection.
Generally, things just feel more broken still. Further work will fix things.
Originally committed to SVN as r4603.
2010-06-26 07:26:27 +00:00
Niels Martin Hansen
70d41d31b2
Remove the SelectionChangeSubscriber mechanism from the grid and implement some basic selection change notification through SelectionController.
...
Change SelectionListener interface so it receives the set of lines added and removed from selection, instead of just the complete new selection.
Update VisualTool<> to use SelectionListener to receive selection change notifications.
This change (temporarily, I hope) breaks feature selection in visual drag mode, when changing selection via the grid. This is caused by the grid selection change first clearing the entire selection, which sends a separate notification about selection clear. This causes the last visual feature to be deselected, and then the visual tool base reselects the active line, causing a new notification for selection to be sent. The active line happens to be the newly clicked line, and the selection notification enters during the externalChange guard being set, and is then ignored for feature update purposes. When control returns to the original SelectRow call in the grid, the line to be selected has already been selected and then nothing happens.
The best fix is to avoid two notifications being required to deselect all then reselect one line in the first place, so making the grid selection handling saner is the best fix.
Originally committed to SVN as r4602.
2010-06-26 04:38:02 +00:00
Niels Martin Hansen
e60d476f4a
Turn BaseGrid into a do-nothing SelectionController<AssEntry>.
...
Originally committed to SVN as r4601.
2010-06-25 01:49:12 +00:00
Niels Martin Hansen
1a626bb14e
Add SelectionController adapted from ADR branch, now templatized on the item data type. Intentionally not making this a merge, the selection controller needs to logically come from trunk into ADR, even if it was added there originally.
...
Originally committed to SVN as r4600.
2010-06-25 01:44:29 +00:00
Niels Martin Hansen
4f0982c7d5
"Intelligently" append dialogue lines to the end of the Events section instead of to the absolute end of file. This will make appending lines slower if attachments are present, but much safer. Updates #1211 .
...
Originally committed to SVN as r4598.
2010-06-24 20:48:49 +00:00
Niels Martin Hansen
6b36d730af
Fix attachments dialogue infinite looping if closed with attachments present. Updates #1212 .
...
Originally committed to SVN as r4596.
2010-06-24 20:43:23 +00:00
Niels Martin Hansen
a71b83f61c
Add some docstrings to Auto4 LuaAssFile class.
...
Originally committed to SVN as r4595.
2010-06-24 19:32:23 +00:00
Niels Martin Hansen
eec24ce562
Remove empty attachments sections when the Attachments dialogue is closed. Updates #1212 .
...
Originally committed to SVN as r4593.
2010-06-24 19:14:13 +00:00
Thomas Goyne
e2a42ccb6c
If undo/redo would result in there being no lines selected, select the last line
...
Originally committed to SVN as r4592.
2010-06-24 07:16:21 +00:00
Thomas Goyne
d8e8f9eb68
Fix bad option names
...
Originally committed to SVN as r4591.
2010-06-24 06:26:44 +00:00
Niels Martin Hansen
3b1189a8b2
Make attachments dialogue set undo points. Updates #1216 .
...
Originally committed to SVN as r4590.
2010-06-24 06:13:51 +00:00
Niels Martin Hansen
7521d2d29d
Fix AssAttachment::Clone() not being const causing it to not override AssEntry::Clone(), and make sure the group field is also copied during cloning. Updates #1216 .
...
Originally committed to SVN as r4589.
2010-06-24 06:13:06 +00:00
Amar Takhar
46da1e538d
Merge r4450 to unbreak non precompiled header building.
...
Originally committed to SVN as r4586.
2010-06-24 01:50:16 +00:00
Thomas Goyne
e2f8e69612
Beat some semblance of sanity into ass_override and related files. Fixes a pile of crashes when tags are missing expected parameters.
...
Originally committed to SVN as r4581.
2010-06-24 01:24:43 +00:00
Thomas Goyne
c64e764648
Make AssFixStylesFilter an order of magnitude faster
...
Originally committed to SVN as r4580.
2010-06-24 01:24:37 +00:00
Thomas Goyne
d1f36bdc43
Eliminate unnessesary character set conversions in TextFileWriter
...
Originally committed to SVN as r4579.
2010-06-24 01:24:32 +00:00
Thomas Goyne
53fb43c7e6
Fix significantly incorrect handling of pretty much everything in AssTransformFramerateFilter and make it better at deciding when it actually needs to do anything.
...
Originally committed to SVN as r4578.
2010-06-24 01:24:26 +00:00
Thomas Goyne
627d423017
Fix memory leak in VariableData
...
Originally committed to SVN as r4577.
2010-06-24 01:24:21 +00:00
Thomas Goyne
cf9eef80ab
Fix memory leak in AssLimitToVisibleFilter
...
Originally committed to SVN as r4576.
2010-06-24 01:24:15 +00:00
Thomas Goyne
2b47f34e76
Fix a pile of actual memory leaks
...
Originally committed to SVN as r4575.
2010-06-24 01:24:09 +00:00
Thomas Goyne
cbf201ab86
Fix some "leaks" of things that should actually be alive for the lifetime of the program to reduce noise.
...
Originally committed to SVN as r4574.
2010-06-24 01:24:02 +00:00
Thomas Goyne
50d1b3ed2d
Rewrite the ass parsing code in visual_tool.cpp, eliminating a lot of repeated code and making it better at finding the correct values.
...
Originally committed to SVN as r4573.
2010-06-24 01:23:43 +00:00
Thomas Goyne
a40b9c4b91
Simplify and speed up AssFile's copy constructor and assignment operator.
...
Originally committed to SVN as r4565.
2010-06-22 00:03:33 +00:00
Thomas Goyne
7958f85ef3
Remove pointless call to AssDialogue::SetEntryData in AssFile::CompressForStack; makes pushing files onto the undo stack about 50% faster
...
Originally committed to SVN as r4564.
2010-06-22 00:03:28 +00:00
Thomas Goyne
5ed401d23d
Use vector<int> instead of vector<bool> for tracking which rows are selected. Makes undo roughly twice as fast.
...
Originally committed to SVN as r4563.
2010-06-22 00:03:22 +00:00
Thomas Goyne
358b2734da
Fix crash when pasting over
...
Originally committed to SVN as r4562.
2010-06-22 00:03:16 +00:00
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
Thomas Goyne
0e527355eb
Kill some code that was last uncommented before revision 1000.
...
Originally committed to SVN as r4314.
2010-05-20 08:55:13 +00:00
Thomas Goyne
519039131f
Fix crash in freehand draw mode of the vector clip visual tool
...
Originally committed to SVN as r4313.
2010-05-20 08:55:08 +00:00
Thomas Goyne
94bffb5b9d
Fix compile error in gcc introduced in r4307 (instantiating templates with private inner types is a msvc extension)
...
Originally committed to SVN as r4311.
2010-05-19 03:24:07 +00:00
Thomas Goyne
f4124e373c
Add single-axis modes to all visual tools
...
Make all visual tools only update the most-changed axis whenever shift
is held down. Previously the rotate and scale tools used ctrl for this
and shift for snapping to round values; these have been swapped for
consistency.
Closes #993 .
Originally committed to SVN as r4310.
2010-05-19 03:24:01 +00:00
Thomas Goyne
115dacb37e
Clean up VisualFeature a bit and make most of OpenGlWrapper's methods const
...
Originally committed to SVN as r4309.
2010-05-19 03:23:55 +00:00
Thomas Goyne
008d59d71e
As we require RTTI anyway, kill AssEntry::GetAsDialogue/Style/Attachment and just use dynamic_cast
...
Originally committed to SVN as r4308.
2010-05-19 00:44:52 +00:00
Thomas Goyne
2124a1dbd3
Rework how sorting works and add sorting by style
...
Rather than going through a ton of work to ensure that every AssEvent
has a sensible start time that happens to leave it in the right place
after sorting, simply sort only consecutive blocks of AssDialogues and
leave everything else untouched. Note that this results in different
behavior when there are multiple [Events] sections in a file -- rather
than moving lines between sections and keeping the number of lines per
section constant, each section keeps the lines it had.
As it's now easy to do, also add sorting by style name and end time.
Closes #614 .
Originally committed to SVN as r4307.
2010-05-19 00:44:44 +00:00
Thomas Goyne
a573b0897b
Add "Open Subtitles From Video" menu option. Closes #253 .
...
Originally committed to SVN as r4306.
2010-05-19 00:44:37 +00:00
Thomas Goyne
a073d48f26
Make all of the controls in the Style Manager dynamically sized. Results in slightly wider buttons with English and much better sized buttons in other languages. Updates #1101
...
Originally committed to SVN as r4303.
2010-05-17 19:48:17 +00:00
Thomas Goyne
49abae2698
Fix a merge conflict and some newline issues
...
Originally committed to SVN as r4290.
2010-05-16 07:06:08 +00:00
Thomas Goyne
2c876e79c3
Make visual tools use only screen coordinates.
...
Previously the visual typesetting tools and the overlay mask used
several coordinate frames, converting between them in many places in
inconsistent ways. This elimiates all uses of coordinate frames other
than screen and script, and makes the conversion done in one place, and
only when parsing or serializing ASS.
This fixes:
- A few minor rounding errors
- Horrible brokeness when only part of the video frame is being
displayed, due to higher levels of zoom than fit onscreen or panning
the video
- Distortion of the visual typesetting tools when the combination of
overridden aspect ratio, script resolution, and video resolution did
not result in square pixels.
- Resolution-dependence of the visual typesetting tools, which resulted
in some tools becoming hard to use at zooms outside the range of
100-200%.
- Some draggable controls used the mouse's script coordinates,
resulting in noticable jerky movement at high zoom levels or when
using strange script resolutions.
Closes #966 .
Originally committed to SVN as r4289.
2010-05-16 06:39:11 +00:00
Thomas Goyne
74a9bdeb41
Limit the canvas size to the window's size to avoid things exploding at high zoom levels
...
Originally committed to SVN as r4288.
2010-05-16 06:39:06 +00:00
Thomas Goyne
94cf2949f1
Make the calculation of black borders in the video display happen on resize rather than on draw.
...
Originally committed to SVN as r4287.
2010-05-16 06:38:59 +00:00
Thomas Goyne
624df412ea
Kill the horrifying PrettyFloat function and just use g instead of f everywhere it was used.
...
Originally committed to SVN as r4280.
2010-05-13 18:41:46 +00:00
Thomas Goyne
1654f4a102
Remove a redundant (and incorrect) check for if the mouse is over the video
...
Originally committed to SVN as r4279.
2010-05-13 18:37:51 +00:00
Thomas Goyne
247e756c9b
Move doxygen stuff for VideoDisplay to the header and fill in some missing docs.
...
Originally committed to SVN as r4278.
2010-05-13 18:37:46 +00:00
Thomas Goyne
290353d467
Bump copyright years on video_display.*
...
Originally committed to SVN as r4277.
2010-05-13 18:37:41 +00:00
Thomas Goyne
5215049c07
Add mouse wheel video zooming
...
Originally committed to SVN as r4276.
2010-05-13 18:37:35 +00:00
Amar Takhar
f002850e17
Fix distfile creation.
...
Originally committed to SVN as r4260.
2010-05-06 16:05:34 +00:00
Thomas Goyne
c7e06e9451
Change the uses of -1 for invalid positions in the visual typesetting tools to INT_MIN, as -1 is sometimes a perfectly valid coordinate
...
Originally committed to SVN as r4258.
2010-05-01 01:45:16 +00:00
Thomas Goyne
5cbabf2d35
Add an option to only display visual typesetting tools when the mouse is over the video.
...
Originally committed to SVN as r4257.
2010-05-01 01:45:10 +00:00
Thomas Goyne
61c141a714
Change zoom to an arbitrary percentage rather than an index into a fixed list of allowed zooms
...
Originally committed to SVN as r4256.
2010-05-01 01:07:05 +00:00
Thomas Goyne
42781c1c62
Make the shift times history display one-based frame numbers when shifting the selection onwards. Updates #1098
...
Originally committed to SVN as r4255.
2010-05-01 01:07:00 +00:00
Thomas Goyne
7a7b7fb5e9
Add menu options for the tag hiding modes to the view menu. Closes #433
...
Originally committed to SVN as r4254.
2010-04-30 20:42:07 +00:00
Thomas Goyne
2fea4bb1ba
Ensure that after using the select lines dialog, the active line is always one of the selected lines. Updates #1176 .
...
Originally committed to SVN as r4253.
2010-04-30 20:42:01 +00:00
Thomas Goyne
ae82498273
Make a few parameters in gl_text const references
...
Originally committed to SVN as r4252.
2010-04-30 16:15:18 +00:00
Thomas Goyne
47beda4c89
Fix build error introduced in r4250 when not using precompiled headers.
...
Originally committed to SVN as r4251.
2010-04-30 16:15:12 +00:00
Thomas Goyne
c3a986414c
Make OpenGLTextTexture use the smallest texture that is large enough to fit the requested glyph rather than always using 256x256
...
Originally committed to SVN as r4250.
2010-04-30 03:00:19 +00:00
Thomas Goyne
27a159793a
(Re)add catch for wchar_t in VideoDisplay::Render as it turns out that some of the stuff it calls still throws strings
...
Originally committed to SVN as r4249.
2010-04-30 03:00:15 +00:00
Thomas Goyne
fd701c67ec
Kill supportsGlClampToEdge, which hasn't actually been used for a while
...
Originally committed to SVN as r4248.
2010-04-30 03:00:09 +00:00
Thomas Goyne
b90fdcc111
Make the video display use OpenGL display lists, slightly simplifying the code and reducing the amount of state explicitly tracked.
...
Originally committed to SVN as r4247.
2010-04-30 03:00:04 +00:00
Thomas Goyne
5f82c5bb02
Make the style manager dialog select the new styles when copying styles between the current script and storage, and fix a few cases where buttons were incorrectly enabled or disabled. Updates #1186 .
...
Originally committed to SVN as r4244.
2010-04-24 21:48:06 +00:00
Thomas Goyne
de459275a1
Fix crash when using the drag visual tool on a line with a four-argument move tag. Closes #1002 .
...
Originally committed to SVN as r4239.
2010-04-22 01:09:24 +00:00
Thomas Goyne
792c8ec66e
Specifically catch exceptions thrown by the subtitle renderer so that we can give a slightly more useful error message.
...
Originally committed to SVN as r4238.
2010-04-22 01:09:16 +00:00
Kevin Ollivier
9fcdfebf82
Fix the waf build after the libresrc changes, and also tweak the script to properly handle dependency tracking with the generated files.
...
Originally committed to SVN as r4173.
2010-03-13 17:50:51 +00:00
Amar Takhar
6a9b0b5589
* Return an std::string
...
* Be const correct.
* Use c_str() to ensure null termination.
* Remove stray , from default_mru.json.
Originally committed to SVN as r4171.
2010-03-06 03:55:27 +00:00
Amar Takhar
c3c14b0815
Change how libresrc is built:
...
* Instead of putting code into the .(c|h) files place it into two new files libresrc.(c|h)
* Bitmaps now go into bitmaps.(c|h)
* Default configs into default_config.(c|h)
With this approach we can easily embed any resources by simply calling it with common-respack and not having to do anything else.
Originally committed to SVN as r4169.
2010-03-03 00:44:17 +00:00
Thomas Goyne
0a8a495aea
Fix a smattering of memory leaks.
...
Originally committed to SVN as r4157.
2010-02-25 21:45:39 +00:00
harukalover
41be900efa
Fixed a memory leak that occurred whenever the Edit menu was opened due to the Undo/Redo items being replaced with new wxMenuItem's without deleting the previous items (now it just updates the label/enabled status without creating new wxMenuItem's)
...
Originally committed to SVN as r4139.
2010-02-21 06:09:28 +00:00
Niels Martin Hansen
6a431b9032
Do an additional range check before grabbing a dialogue line by index in BaseGrid. Not doing it makes MSVC debug runtimes spew assertions and whatnot. This shouldn't break anything... I hope it doesn't.
...
Originally committed to SVN as r4134.
2010-02-21 01:25:15 +00:00
Kevin Ollivier
5cafad1d81
Just call Next/PrevFrame now that the audio playing behavior is implemented inside those methods.
...
Originally committed to SVN as r4122.
2010-02-17 19:07:37 +00:00
Kevin Ollivier
3a58a48e1a
Move the logic to play the audio on stepping through video into video_context so that the VideoSlider's Next/PrevFrame can behave consistently regardless of where they're called from.
...
Originally committed to SVN as r4121.
2010-02-17 19:04:41 +00:00
Kevin Ollivier
3082838aa1
Add an option to play audio when stepping through video, like some other video players do. Also, add .mov as a file format to load, as it is widely used on Mac and seems to work fine for me with ffmpeg.
...
Originally committed to SVN as r4120.
2010-02-17 06:24:29 +00:00
Kevin Ollivier
65b09da334
Add missing include.
...
Originally committed to SVN as r4107.
2010-02-15 03:06:04 +00:00
Thomas Goyne
e5416f01dc
Fix debug assertion in style manager when "Copy" is clicked with zero styles selected.
...
Originally committed to SVN as r4105.
2010-02-14 22:44:29 +00:00
Thomas Goyne
429a57ef68
Change the logic for when the style editor asks the user if they wish to update existing lines when renaming a style to be based on whether it is a newly created style rather than whether the style's name starts with "Copy of". Updates #1060 .
...
Originally committed to SVN as r4103.
2010-02-14 22:26:45 +00:00
Thomas Goyne
509f748cfb
Make VideoContext::SetVideo explicitly call VideoContext::UpdateDisplays rather than relying on the calling code restoring it to a consistent state. Updates #1159 .
...
Originally committed to SVN as r4101.
2010-02-14 22:02:33 +00:00
Thomas Goyne
621cefe14e
Fix compile error on non-windows caused by r4097.
...
Originally committed to SVN as r4099.
2010-02-14 18:06:56 +00:00
Thomas Goyne
175b2a4648
Rewrite the texture grid positioning code again, fixing several visual defects that showed up in OpenGL 1.1 mode. Updates #1153 .
...
Originally committed to SVN as r4097.
2010-02-14 17:41:41 +00:00
Thomas Goyne
c9ba8329ad
Change all incorrect uses of __WXDEBUG__ to _DEBUG. __WXDEBUG__ being defined does not necessarily mean that it is a debug build, and by default it is defined in release builds of wx as of 2.9.1.
...
Originally committed to SVN as r4089.
2010-02-09 04:31:33 +00:00
Niels Martin Hansen
48e321f8ef
Juggle a weird control structure to be more regular.
...
Originally committed to SVN as r4086.
2010-02-05 16:06:37 +00:00
Niels Martin Hansen
6fe0eb96be
Define an RAII wrapper for the Win32 HANDLE type and make sure all handles created also get closed in the DSound2 audio player. Updates #1145 .
...
Originally committed to SVN as r4084.
2010-02-05 15:13:11 +00:00
Niels Martin Hansen
702739b32e
Doxygen-document DSound2 audio player
...
Originally committed to SVN as r4083.
2010-02-05 14:51:12 +00:00
Niels Martin Hansen
fe65749623
Merge r4081, closes #1126 .
...
Originally committed to SVN as r4082.
2010-02-05 13:22:43 +00:00
Thomas Goyne
7ac273eca0
Fix problems with how VideoDisplay's size was being set resulting in the border being subtracted from the video size and the video always taking up the full width of the box even at very low zoom levels. Updates #1137 , #1140 .
...
Originally committed to SVN as r4077.
2010-01-31 18:49:37 +00:00
Grigori Goronzy
08817a3e98
Add missing includes to fix compilation without precompiled headers.
...
Fixes #1129 . Patch by buscher.
Originally committed to SVN as r4076.
2010-01-31 14:55:03 +00:00
Grigori Goronzy
ba0cf4463f
Delete gcc precompiled headers in distclean.
...
Originally committed to SVN as r4072.
2010-01-30 16:59:24 +00:00
Grigori Goronzy
5db8abd330
OSS player: convert device name to UTF-8 string.
...
Originally committed to SVN as r4071.
2010-01-30 15:08:50 +00:00
Thomas Goyne
b5064f8fc9
Replace lua's default lua module loader with one which uses our UTF-8-supporting script reader.
...
Originally committed to SVN as r4060.
2010-01-28 01:13:13 +00:00
Amar Takhar
e89e7b4be2
Make dictionary printfs easier to read. (also add one for the thesaurus)
...
Originally committed to SVN as r4051.
2010-01-26 13:56:56 +00:00
Amar Takhar
b822ec6343
Merge translations from 2.1.8.
...
Originally committed to SVN as r4047.
2010-01-26 13:43:02 +00:00
Amar Takhar
27a1d68ec4
Call OnUnhandledException() only when wxWidgets is compiled with exception handling.
...
Originally committed to SVN as r4044.
2010-01-26 13:18:53 +00:00
Amar Takhar
0cd4f1225d
Merge 3906,r3909,r3910,r3912,r3928,r3931,r3932,r3933,r3935,r3936: merge update checker from 2.1.8, this also needs to be documented for doxygen. closes #1084 .
...
Originally committed to SVN as r4042.
2010-01-26 13:14:05 +00:00
Thomas Goyne
0a12e60a36
Add the Automation include path to lua's module load path.
...
Originally committed to SVN as r4038.
2010-01-24 19:07:34 +00:00
Thomas Goyne
7ffc3d4080
Move more of the purely OpenGL-related code into VideoOutGL from VideoDisplay and simplify the calculation of the texture grid positions slightly.
...
Originally committed to SVN as r4037.
2010-01-24 19:05:20 +00:00
Thomas Goyne
ba088237d7
Add some documentation for AegisubCSConv and TextFileReader.
...
Originally committed to SVN as r4036.
2010-01-24 18:56:51 +00:00
Amar Takhar
c7d95e5590
Add greg to the about dialog credits.
...
Originally committed to SVN as r4035.
2010-01-24 02:37:47 +00:00
Amar Takhar
f43bff1e97
merge r4003 (options dialogue layout fixes)
...
Originally committed to SVN as r4021.
2010-01-21 00:28:07 +00:00
Amar Takhar
89e2428dbe
merge r3992 (restart-helper fixes)
...
Originally committed to SVN as r4020.
2010-01-21 00:26:45 +00:00
Amar Takhar
4221919d4f
merge r3983,r4002 (more string fixes.)
...
Originally committed to SVN as r4019.
2010-01-21 00:24:59 +00:00
Amar Takhar
79c1716ccd
merge r3982.
...
Originally committed to SVN as r4017.
2010-01-21 00:01:46 +00:00
Amar Takhar
e76cfae9bb
Merge r3974: asserts in colour picker dialog.
...
Originally committed to SVN as r4015.
2010-01-20 22:49:26 +00:00
Niels Martin Hansen
f1fa69d528
Merge r3999 to trunk, updates #566 .
...
Also, 4000 GET.
Originally committed to SVN as r4000.
2010-01-19 08:50:40 +00:00
Thomas Goyne
80fdea74e6
Merge r3994 from the 2.1.8 branch. Closes #999 .
...
Originally committed to SVN as r3995.
2010-01-19 01:05:51 +00:00
Grigori Goronzy
8c8f59b5ff
Fix ALSA player. Works On My Computer [tm].
...
Originally committed to SVN as r3990.
2010-01-15 22:58:51 +00:00
Grigori Goronzy
6006fb5bba
Redirect mouse events from the color picker dialog to the dropper icon
...
to make the color dropper work on Unix/GTK. OS X still needs fixes.
Originally committed to SVN as r3975.
2010-01-12 03:19:49 +00:00
Niels Martin Hansen
7e079a3fc2
Merge r3967 from 2.1.8, closes #971 .
...
Originally committed to SVN as r3968.
2010-01-10 16:15:31 +00:00
Niels Martin Hansen
8c036dfc3b
Merge r3965 back in trunk. Closes #791 .
...
Originally committed to SVN as r3966.
2010-01-10 16:02:01 +00:00
Thomas Goyne
8657658c70
Fix undefined behavior sometimes resulting in a crash when copying styles to or from storage when the style name already exists. Patch by Paranoja. Closes #1096 .
...
Originally committed to SVN as r3961.
2010-01-07 00:48:27 +00:00
Thomas Goyne
a1902a0690
Remove the frequently unstable or nonfunctional attempt at automatically loading audio from the loaded video when playing with no audio loading. Updates #1090 .
...
Originally committed to SVN as r3954.
2010-01-06 08:02:15 +00:00
Niels Martin Hansen
f805ec707e
Merge r3951 from 2.1.8 back in: fixing old URLs
...
Originally committed to SVN as r3952.
2010-01-06 05:23:58 +00:00
Amar Takhar
dbc885fdb0
Merge r3929 to fix the video slider, updates #1073 .
...
Originally committed to SVN as r3939.
2010-01-05 00:51:53 +00:00
Kevin Ollivier
5374441cdd
Use correct framework header so that we get CFStringRef, etc. included as well.
...
Originally committed to SVN as r3938.
2010-01-05 00:50:09 +00:00
Thomas Goyne
8513fef7e2
Eliminate an unnecessary call to VideoContext::UpdateDisplays triggered by SubsEditBox::SetToLine, moderately improving responsiveness when working with lines that take a long time to render.
...
Originally committed to SVN as r3925.
2010-01-02 06:23:02 +00:00
Niels Martin Hansen
54ff8124b6
Merge r3907 back to trunk, closes #1072
...
Originally committed to SVN as r3908.
2009-12-27 19:49:27 +00:00
Amar Takhar
b00a77c5f5
Add missing headers to quicktime_common.cpp and video_provider_quicktime.cpp.
...
Originally committed to SVN as r3899.
2009-12-25 04:32:36 +00:00
Amar Takhar
face7faec3
Fix bundledirs-test target.
...
Originally committed to SVN as r3896.
2009-12-25 03:31:01 +00:00
Amar Takhar
6b454601da
* Add a new function to libosxutil: OSX_OpenLocation which calls LSOpenCFURLRef, it accepts a URL (except for local paths) and opens the correct program using the Launcher.
...
* Add a new help menu option to access internal resources located within the bundle.
Closes #1033 and updates #1070 .
Originally committed to SVN as r3895.
2009-12-25 03:28:15 +00:00
Amar Takhar
fff128fcfa
Add support for building the QuickTime A/V providers under OSX.
...
Originally committed to SVN as r3893.
2009-12-24 23:06:47 +00:00
Amar Takhar
a49aa20a22
Merge r3891 (hunspell path fix.)
...
Originally committed to SVN as r3892.
2009-12-24 18:16:19 +00:00
Thomas Goyne
2f2f0d9aac
Fix some assorted VideoOutGL-related stupidity. Updates #1056 .
...
Originally committed to SVN as r3864.
2009-12-13 19:27:45 +00:00
Niels Martin Hansen
eb938aa5ed
Check video size on open and change zoom level to 50% or 25% if the video is greater than some proportions of the window size.
...
Updates #1054 .
Originally committed to SVN as r3858.
2009-12-12 01:38:09 +00:00
Kevin Ollivier
dd0da6744b
Commit of start on waf build system. Uses the most recent waf release. Currently builds on OS X with ffmpeg, OpenAL and libass providers, do waf configure; waf build to build.
...
Originally committed to SVN as r3854.
2009-12-07 00:42:51 +00:00
Kevin Ollivier
31ec52b415
Fix constness issue that makes gcc on SnowLeopard fail to compile.
...
Originally committed to SVN as r3853.
2009-12-07 00:06:35 +00:00
Thomas Goyne
fc75937466
Make some non-mutating hotkey methods const.
...
Originally committed to SVN as r3852.
2009-12-05 04:26:07 +00:00
Amar Takhar
c3a6fbae6e
Commit patch from Harukalover to fix prefs dialogue asserts. (tested) Updates #1053 .
...
Originally committed to SVN as r3849.
2009-12-01 20:46:04 +00:00
Thomas Goyne
a1f3fb7dc0
Prevent times from rounding to the magic zero in the framerate transform. Updates #1007 .
...
Originally committed to SVN as r3839.
2009-12-01 01:56:06 +00:00
Thomas Goyne
4a31f0375f
Add \fs+ and \fs- to the ASS parser so they aren't killed by transforms. Updates #1007 .
...
Originally committed to SVN as r3838.
2009-12-01 01:27:32 +00:00
Thomas Goyne
86f64b2962
Improve video operation errors somewhat. Updates #1020 .
...
Originally committed to SVN as r3835.
2009-12-01 00:32:43 +00:00
Karl Blomster
dadd09ff49
Remove SetCacheMax() function as it is no longer used.
...
Originally committed to SVN as r3833.
2009-11-29 19:12:40 +00:00
Karl Blomster
e38b00fb51
Update documentation according to changes in r3831.
...
Originally committed to SVN as r3832.
2009-11-29 19:09:55 +00:00
Karl Blomster
abd2597d0f
Change GetDesiredCacheSize() to WantsCaching() since video providers aren't setting number of frames to cache anymore.
...
Originally committed to SVN as r3831.
2009-11-29 19:07:53 +00:00
Karl Blomster
ed3b47b250
document new function introduced in r3829
...
Originally committed to SVN as r3830.
2009-11-29 19:01:32 +00:00
Karl Blomster
6b04f5ee8f
Make the caching video provider use a user-configurable max cache size in bytes instead of a hardcoded number of frames. Defaults to using 32 MB (about 10 frames at 720p) of memory for the cache.
...
Originally committed to SVN as r3829.
2009-11-29 18:59:21 +00:00
Karl Blomster
85d645b44a
Allow user to set behavior of audio decoding errors during indexing with the FFMS2 providers.
...
Originally committed to SVN as r3822.
2009-11-28 21:13:47 +00:00
Karl Blomster
e720bba41c
Fix a bug that would occasionally cause opening audio using the ffms2 audio provider to fail with error "out of bounds track number selected".
...
Originally committed to SVN as r3818.
2009-11-21 22:08:03 +00:00
Karl Blomster
653427fbad
Update ffms2 to r234, part 2. Compilation fixed again.
...
Originally committed to SVN as r3815.
2009-11-21 21:15:02 +00:00
Niels Martin Hansen
3e52c7a592
Update #1013 with a temporary fix. Changes to wxString in wx 2.9 caused the issue, because wxString::c_string() no longer returned a wchar_t* or char* and thus those weren't caught by the proper exception handler.
...
This fix should be replaced with a proper exception type later.
Originally committed to SVN as r3813.
2009-11-21 13:24:12 +00:00
Niels Martin Hansen
815ad4b8ca
Change 2points' entry to his real name: Moritz Brunner. Updates #894 .
...
Originally committed to SVN as r3810.
2009-11-18 18:46:43 +00:00
Amar Takhar
9058c51968
Change p-static entry to his real name: Ravi Pinjala. updates #894 .
...
Originally committed to SVN as r3803.
2009-11-17 05:32:33 +00:00
Thomas Goyne
9ff7c6abbb
Remove some unused locals in frame_main_events.cpp that were last used in r106.
...
Originally committed to SVN as r3800.
2009-11-17 02:43:43 +00:00
Thomas Goyne
feb77217c7
Fix bug where detaching loaded but hidden video had broken results.
...
Originally committed to SVN as r3798.
2009-11-17 01:37:18 +00:00
Amar Takhar
3719227e9e
Include wx/display.h last, it needs some values that aren't inited by display.h itself. I'm not sure if this is a bug as a lot of other headers seem to have this problem too. Fixes compilation errors when not using precompiled headers (which loads about 30 headers before this one.) This fixes non-PCH compilation updates #1040
...
Originally committed to SVN as r3794.
2009-11-15 20:53:31 +00:00
Niels Martin Hansen
3c11e2831e
Missed some headers in r3774, which caused compilation errors when precompiled headers were not used. Updates #1040 .
...
Originally committed to SVN as r3776.
2009-11-14 01:06:11 +00:00
Niels Martin Hansen
58674d1cea
Make detached video display reposition itself if it opens partially or entirely out of view. Updates #1040 .
...
Originally committed to SVN as r3774.
2009-11-14 00:42:55 +00:00
Amar Takhar
72ddd4ba6f
Remove reference to prs cpp file missed in r3748, updates #1012 .
...
Originally committed to SVN as r3763.
2009-11-04 07:10:15 +00:00
Niels Martin Hansen
3c75547292
Make "Untitled" and "untitled" translateable, updates #792 .
...
Originally committed to SVN as r3761.
2009-11-04 05:27:09 +00:00
Niels Martin Hansen
cd4905fe34
Fix build-error in DirectSoundPlayer2 when building Debug, signedness mismatch in an assert triggers a warning that causes an error.
...
Originally committed to SVN as r3758.
2009-11-04 04:16:25 +00:00
Niels Martin Hansen
129585a2f8
Remove the ability for Aegisub to do its own file type associations. It's something the installer should be doing.
...
Originally committed to SVN as r3757.
2009-11-03 02:42:19 +00:00
harukalover
3c2997e906
Fixed a crash that would occur if the mouse was left in a captured state after closing and reopening the color picker. Updates #1025
...
Originally committed to SVN as r3754.
2009-11-01 07:28:09 +00:00
Niels Martin Hansen
d2834dca45
Re-integrate r3740 from the 2.1.8 branch to fix the DirectSoundPlayer2 buffer locking bug.
...
Updates #1028 .
Originally committed to SVN as r3751.
2009-10-31 00:54:42 +00:00
Amar Takhar
afd9133fc0
Remove PRS support, I've left the files in devel/prs they can be deleted at a later time.. Closes #1012 .
...
Originally committed to SVN as r3748.
2009-10-28 01:10:11 +00:00
Amar Takhar
b587ad3b8d
Add boost license.
...
Originally committed to SVN as r3743.
2009-10-28 00:28:36 +00:00
Thomas Goyne
15cf221a3f
Fix incorrect handling of flipped video when the texture size is larger than the video size.
...
Originally committed to SVN as r3742.
2009-10-27 20:59:27 +00:00
Thomas Goyne
dcfdb02e6c
Significantly reduce the number of unnecessary calls to VideoContext::GetFrame.
...
Originally committed to SVN as r3739.
2009-10-27 14:27:39 +00:00
Amar Takhar
7de7dba807
Merge r3733 for jfs, fixes #977
...
Originally committed to SVN as r3735.
2009-10-26 23:44:16 +00:00
Amar Takhar
002a5dd980
Merge r3732 for jfs, fixes #915
...
Originally committed to SVN as r3734.
2009-10-26 23:37:47 +00:00
Thomas Goyne
4fc2b90399
Add support for externally controlled frame data to AegiVideoFrame, and take advantage of this in the FFMS2 video provider to eliminate a copy of the frame data. Net speedup for seeking from beginning to end of several test files is 10-20%.
...
Originally committed to SVN as r3729.
2009-10-24 02:07:56 +00:00
Thomas Goyne
c4d07cb525
Remove AegiVideoFrame::cppAlloc, which was only needed by the dshow video provider.
...
Originally committed to SVN as r3728.
2009-10-21 04:29:15 +00:00
Thomas Goyne
7581d41935
Remove AegiVideoFrame::GetFloat and some related code as it was only there for fextracker.
...
Originally committed to SVN as r3727.
2009-10-21 04:07:00 +00:00
Thomas Goyne
df5ada1006
Make the video display only upload texture data when the frame has changed rather than every time Render is called.
...
Originally committed to SVN as r3726.
2009-10-20 19:07:18 +00:00
Thomas Goyne
5404b45017
Tweak how the OpenGL 1.1 code behaves slightly; distortion with Windows 7's OpenGL emulation is now at most .1% instead of at most 2%.
...
Originally committed to SVN as r3723.
2009-10-19 01:11:02 +00:00
Thomas Goyne
5b9da0c56a
Fix some video output bugs related to a small maximum texture size which is not an even divisor of the video size.
...
Originally committed to SVN as r3717.
2009-10-17 03:41:12 +00:00
Thomas Goyne
3d58608230
Improve rendering with OpenGL 1.1, removing the visible seams at the cost of slight distortions at high zoom levels.
...
Originally committed to SVN as r3714.
2009-10-14 20:53:36 +00:00
Thomas Goyne
9ff8f42d7f
Get the video display closer to working with W7's emulated OpenGL. It can now display video, but there are visible seams between the textures.
...
Originally committed to SVN as r3711.
2009-10-13 22:19:31 +00:00
harukalover
59cf4b656a
Removed the log window which nobody seems to use. Closes #1026
...
Originally committed to SVN as r3710.
2009-10-13 21:53:50 +00:00
Thomas Goyne
3032c4f883
Fix a memory leak and a minor graphical glitch that sometimes happened to the video slider when switching visual typesetting modes.
...
Originally committed to SVN as r3709.
2009-10-13 17:28:39 +00:00
Thomas Goyne
389f296b4d
Make the video display actually hide when the detached video dialog is minimized.
...
Originally committed to SVN as r3706.
2009-10-13 04:10:55 +00:00
harukalover
7dcb6cd387
Fix the annoying habit of all debug output being printed twice
...
Originally committed to SVN as r3701.
2009-10-12 05:11:24 +00:00
Thomas Goyne
68de84b427
Fix some minor quirks with detached video and the display mode.
...
Originally committed to SVN as r3688.
2009-10-11 22:10:08 +00:00
Thomas Goyne
5cf7724698
Disable zoom controls when video is detached as the zoom is ignored with detached video.
...
Originally committed to SVN as r3676.
2009-10-10 15:21:26 +00:00
Thomas Goyne
75f010f889
Make global hotkeys work when the detached video dialog is focused.
...
Originally committed to SVN as r3675.
2009-10-10 15:05:17 +00:00
Thomas Goyne
c0364b7be1
Remove pointless keydown handlers on things that can't have keyboard focus.
...
Originally committed to SVN as r3674.
2009-10-10 02:13:15 +00:00
Thomas Goyne
983434a6c3
Make the video slider forward unprocessed key events to the video display.
...
Originally committed to SVN as r3672.
2009-10-09 22:27:27 +00:00
harukalover
36386e74fc
Fixed the jump to dialog never displaying anything but 0 in the hour column. Updates #1003 .
...
Originally committed to SVN as r3668.
2009-10-09 19:43:43 +00:00
Amar Takhar
14e2d9ad12
Add config.h to 8 files that were missing it, _all_ source files must include config.h at the very top.
...
Originally committed to SVN as r3666.
2009-10-09 16:34:38 +00:00
Amar Takhar
42e0dd6ce4
Update universalchardet using a patch I made around 2009-02, the one we're currently using is from ~1998. I'll check again later to see if there are any updates to it before closing the ticket. Updates #866 .
...
Originally committed to SVN as r3653.
2009-10-09 14:30:27 +00:00
Thomas Goyne
05c9ffde7a
Make detached video work again.
...
Originally committed to SVN as r3651.
2009-10-09 02:21:30 +00:00
Amar Takhar
85d3ea9277
Commit patch for #1019 for jfs' as he doesn't have the branch compiling locally, I'll merge this to milestone:2.1.8 after this, updates #1019 .
...
Originally committed to SVN as r3644.
2009-10-08 20:24:25 +00:00
Thomas Goyne
37ec7ad62c
Increase the maximum zoom to 300%.
...
Originally committed to SVN as r3634.
2009-10-06 17:43:15 +00:00
Thomas Goyne
1f27582b50
Remove some members of VideoContext that are no longer used with the rewritten video display.
...
Originally committed to SVN as r3633.
2009-10-06 16:19:36 +00:00
Thomas Goyne
bead7360c4
Delete threaded video mode, as it never worked in the first place and is fundamentally flawed.
...
Originally committed to SVN as r3632.
2009-10-06 16:12:23 +00:00
Amar Takhar
9217476357
Bitten by precompiled headers round 2: the OpenGL headers must be included before the local headers.
...
Originally committed to SVN as r3631.
2009-10-06 16:08:39 +00:00
Amar Takhar
ac260ec47b
Sigh, bitten by precompiled headers, wxLogDebug requires <wx/log.h>.
...
Originally committed to SVN as r3630.
2009-10-06 15:47:43 +00:00
Amar Takhar
c204c766ec
Add two more debug printfs:
...
* Print the WxH of the frame size.
* Print the size of the texture actually used.
Originally committed to SVN as r3629.
2009-10-06 15:28:22 +00:00
Amar Takhar
bb4506354f
Add a debug printf to display what texture sizes VideoOutGL::TestTexture is checking.
...
Originally committed to SVN as r3628.
2009-10-06 14:58:32 +00:00
Amar Takhar
21c5e7909c
svn:eol-style native and svn:keywords Id to relevent files.
...
Originally committed to SVN as r3623.
2009-10-05 23:04:30 +00:00
Thomas Goyne
40987da11a
Fix spelling of video_out_gl.cpp.
...
Originally committed to SVN as r3620.
2009-10-05 21:32:44 +00:00
Thomas Goyne
404e6cf081
Add support for flipped video to new video renderer.
...
Originally committed to SVN as r3617.
2009-10-05 20:50:04 +00:00
Thomas Goyne
cbd76e7010
Rewrite the video rendering code to support displaying videos which are larger than the maximum texture size. This does not currently support YV12 (which Aegisub currently never uses), but should be otherwise functional.
...
Originally committed to SVN as r3615.
2009-10-05 04:22:28 +00:00
Thomas Goyne
df58224b55
Add #pragma once to exception.h.
...
Originally committed to SVN as r3613.
2009-10-05 00:06:11 +00:00
Thomas Goyne
d54ddc688b
Make font_file_lister.cpp build on windows when freetype2 is disabled (broken by r3536).
...
Originally committed to SVN as r3609.
2009-10-02 23:15:31 +00:00
Grigori Goronzy
6ce51f9435
Add a forward declaration which is apparently needed with certain gcc
...
versions
Originally committed to SVN as r3583.
2009-09-27 01:20:12 +00:00
Karl Blomster
6490c82e79
Change the way ffms2 index cache files are named to use source filename (without path) + source file's size in bytes + source file modification time, instead of just source file path + size in bytes, in order to make reusing index cache files on other computers easier. Closes #1008 .
...
Originally committed to SVN as r3582.
2009-09-27 00:32:19 +00:00
Karl Blomster
9d80eb066f
Updating ffms2 to r221 (2.12), step 3/3: Aegisub interface
...
Originally committed to SVN as r3576.
2009-09-26 21:58:00 +00:00
Niels Martin Hansen
9104079dab
Uncomment stuff to close #716 .
...
Originally committed to SVN as r3563.
2009-09-26 19:44:41 +00:00
Karl Blomster
fcd8f4e04e
Throw an error instead of crashing if user attempts to load audio with bitdepth >16bits/sample. Updates #996 .
...
Originally committed to SVN as r3545.
2009-09-21 01:52:34 +00:00
Karl Blomster
3edb446bec
Fix (?) a bug that caused VFR transformation export to be broken, which also affected certain video providers when external timecodes were used.
...
Originally committed to SVN as r3542.
2009-09-20 20:45:54 +00:00
Karl Blomster
57d549f538
unbreak the y4m provider
...
Originally committed to SVN as r3541.
2009-09-19 21:34:40 +00:00
Karl Blomster
7ba66342b0
silence a MSVC warning
...
Originally committed to SVN as r3540.
2009-09-19 20:15:59 +00:00
Amar Takhar
fa9c8c17f8
Remove 35 of the 39 pragma once added in r3538. I didn't realise so many would be not required. This patch isn't tested on windows, I'll fix it after the buildbot takes a run at it.
...
Originally committed to SVN as r3539.
2009-09-18 03:01:51 +00:00
Amar Takhar
11e1935d76
Remove include guards in favour of '#pragma once'. Normally I would use an include guard however #pragama once is easier to spot and we already used it in mst of our files, this is for the sake of consistency until they're removed.
...
Originally committed to SVN as r3538.
2009-09-18 02:48:31 +00:00
Amar Takhar
aea050fbee
I have no idea how or why this change got in, but fix a license line wrap.
...
Originally committed to SVN as r3537.
2009-09-16 12:19:52 +00:00
Amar Takhar
aba73d4308
Remove 'pragma once' from colour_button.h font_file_lister.h gl_wrap.h subs_edit_ctrl.h.
...
Originally committed to SVN as r3536.
2009-09-16 12:18:09 +00:00
Amar Takhar
130e840028
I thought subtitles_provider.h was in src/ I didn't realise it was an include when trying to revert it. Of course I'd have noticed that beforehand if I was paying attention to what svn told me. This should have been in r3533.
...
Originally committed to SVN as r3535.
2009-09-11 19:21:19 +00:00
Amar Takhar
f41123aad4
Wrap shlobj.h with WIN32 again, it got removed in a previous commit.
...
Originally committed to SVN as r3534.
2009-09-11 18:55:33 +00:00
Amar Takhar
8504b4790d
Remove '#pragma once' from 84 files that don't need it. Thanks to Plorkyeran for testing this on windows. The next step is to detangle the remaining files that currently require it.
...
Originally committed to SVN as r3533.
2009-09-11 18:51:48 +00:00
Amar Takhar
a874981ed7
ass_entry.h actually does need include/aegisub/exception.h, didn't notice because of precompiled headers.
...
Originally committed to SVN as r3532.
2009-09-11 05:04:05 +00:00
Amar Takhar
ca01bb2b86
Add an include guard in agi_pre.h, for whatever reason GCC likes to include the precompiled header twice. I've added a note that this needs to be looked at eventually.
...
Originally committed to SVN as r3531.
2009-09-11 04:35:45 +00:00
Amar Takhar
b0df329ce9
Remove un-needed inclusion of include/aegisub/exception.h
...
Originally committed to SVN as r3530.
2009-09-11 04:35:11 +00:00
Amar Takhar
b116610d12
Add missing headers that are in agi_pre.h but not the actual header, should fix the non-precompiled header build.
...
Originally committed to SVN as r3529.
2009-09-11 02:59:48 +00:00
Niels Martin Hansen
42a293ccca
As <aegisub/exception.h> should become widely used soon enough, add it to the precompiled headers.
...
Protect <omp.h> from inclusion on compilers that don't support OpenMP.
Originally committed to SVN as r3528.
2009-09-11 02:49:58 +00:00
Niels Martin Hansen
d1c70ef6d2
Protect agi_pre.h from double inclusion during PCH generation in MSVC.
...
Originally committed to SVN as r3527.
2009-09-11 02:47:14 +00:00
Niels Martin Hansen
a3bf534b5e
Fixes for internal logical consistency of exception.h. (Make sure we can actually support inner exceptions in all cases.)
...
Also make it follow the AGI_PRE pattern.
Originally committed to SVN as r3526.
2009-09-11 02:46:01 +00:00
Amar Takhar
774fb0f674
Fix all the headers in *., this includes:
...
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
* Sorting alphabetically.
* Same operation as r3515.
Note: This is broken when precompiled headers are not in use, I'll fix that after this commit so the two changes don't get jumbled up.
Originally committed to SVN as r3525.
2009-09-11 02:36:34 +00:00
Amar Takhar
8eda8f2a9c
Add <wx/arrstr.h> which was accidentally left out when moving the patch from one machine to the other in r3518.
...
Originally committed to SVN as r3524.
2009-09-11 02:30:10 +00:00
Amar Takhar
e4271d6aac
Add missing <fstream> header, this should fix compilation on unix/osx.
...
Originally committed to SVN as r3521.
2009-09-11 01:07:38 +00:00
Grigori Goronzy
b017d60e39
Forward declaration for AutoloadScriptManager too
...
Seems to work without it for others, but I have no idea why. This
shouldn't harm in this case still.
Originally committed to SVN as r3520.
2009-09-10 23:28:15 +00:00
Niels Martin Hansen
6cc37d3f0b
A bit more cleaning of precompiled headers for Windows builds. Comment on why things are done as they are. Also move a few headers only used in single files out of the precompiled header and into the places they're actually used.
...
Originally committed to SVN as r3519.
2009-09-10 23:08:38 +00:00
Amar Takhar
88276ed1f4
* Move some headers below the rest as they need wx settings that don't seem to be inited when the header is first in the list.
...
* Add some missing headers and reposition one from the file to header.
* Revert r3516 as it's no longer needed.
Originally committed to SVN as r3518.
2009-09-10 22:48:29 +00:00
Niels Martin Hansen
1d80d6514b
Juggle include order in agi_pre.h around a bit to make things work properly on Windows.
...
Originally committed to SVN as r3517.
2009-09-10 14:39:39 +00:00
Amar Takhar
d455a61732
Set wxUSE_CHOICEDLG to 1, I don't know why this is required I'll look at it later.
...
Originally committed to SVN as r3516.
2009-09-10 13:43:31 +00:00
Amar Takhar
d348b4e33e
Fix all the headers in *.cpp, this includes:
...
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
* Sorting alphabetically.
Originally committed to SVN as r3515.
2009-09-10 13:06:40 +00:00
Amar Takhar
79397825cf
Add missing wx/log.h, sort headers.
...
Originally committed to SVN as r3514.
2009-09-10 10:51:49 +00:00
Amar Takhar
7a8c5229fd
* Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed.
...
* Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list
* Use <> versus "" for the wx header in avisynth_wrap.cpp
* Remove xx/wx.h from agi_pre.h as it's included by wxprec.h.
Originally committed to SVN as r3513.
2009-09-10 10:26:50 +00:00
Amar Takhar
84996c927f
Add a whole slew of missing includes, prior to r3509 config_unix.h used to include stdwx.h, now that I'm fixing the headers I removed it which caused issues when not using precompiled headers.
...
Originally committed to SVN as r3512.
2009-09-10 05:25:25 +00:00
Amar Takhar
6a7e4769e3
Add several dozen more headers to agi_pre.h
...
Originally committed to SVN as r3510.
2009-09-10 04:29:04 +00:00
Amar Takhar
05ae13a8ab
* Rename stdwx.h to agi_pre.h as it doesn't include wx headers only, it's confusing.
...
* Rename include guard to AGI_PRE.
Originally committed to SVN as r3509.
2009-09-10 04:14:28 +00:00
Thomas Goyne
132d8ba3ac
Move #include "config.h" to before #define WX_PRE so that it does gets included at some point.
...
Originally committed to SVN as r3508.
2009-09-10 03:14:09 +00:00
Thomas Goyne
e0cc5fc038
Wrap wx includes with _CRT_SECURE_NO_WARNINGS to make msvc stop hurfing and durfing.
...
Originally committed to SVN as r3507.
2009-09-10 02:52:34 +00:00
Amar Takhar
bdbb8cc4ce
Wrap config.h with WX_PRE so it doesn't get included twice. stdwx.h requires it to be included.
...
Originally committed to SVN as r3506.
2009-09-10 02:42:06 +00:00
Amar Takhar
3c1b52eb69
Add 79 missing wx includes to stdwx.h, the build is much faster on unix, should be the same for windows.
...
Originally committed to SVN as r3505.
2009-09-10 02:32:55 +00:00
Amar Takhar
deeec2de18
Re-organise stdwx.h and sort alphabetically.
...
Originally committed to SVN as r3504.
2009-09-10 02:27:25 +00:00
Amar Takhar
925fa88c0c
* Remove #pragma once.
...
* Sort wx headers and wrap with #ifndef WX_PRE.
* Add missing heade rto stdwx.h.
M src/ass_attachment.h
M src/subs_grid.cpp
M src/ass_dialogue.cpp
M src/ass_attachment.cpp
M src/aegisub_endian.h
M src/audio_display.cpp
M src/audio_karaoke.cpp
M src/dialog_kara_timing_copy.cpp
M src/ass_dialogue.h
M src/text_file_writer.cpp
M src/stdwx.h
Originally committed to SVN as r3503.
2009-09-10 02:23:43 +00:00
Amar Takhar
d519f4589d
* Remove main.h from files that don't require it.
...
* Remove include guard in main.h as it's no longer required.
* Sort wx headers and wrap with #ifndef WX_PRE.
* Add #define WX_PRE to stdwx.h.
Originally committed to SVN as r3502.
2009-09-10 02:07:55 +00:00
Thomas Goyne
1a4e7375fd
Add some documentation to VideoDisplay and clean up the includes a bit.
...
Originally committed to SVN as r3501.
2009-09-10 01:41:34 +00:00
Amar Takhar
0992a68488
Rewrite how wxStackWalker works:
...
* Change from fstream to wxFile.
* Create both text-based and xml based reports (for the reporter)
Originally committed to SVN as r3499.
2009-09-09 07:04:10 +00:00
Grigori Goronzy
5ab1eab906
OSS player: handle changing end position correctly
...
If the slider is moved to the playbar while the player is running,
the playback needs to be stopped. Handle this situation properly.
Additionally, select a low-latency buffer policy if possible (OSS4
only). This will make it possible to move the slide near the playbar
without stopping playback (the current writing position is always in
advance of the playback position by the buffer size!)
Originally committed to SVN as r3498.
2009-09-09 03:24:34 +00:00
Grigori Goronzy
9d0daf6821
Add OSS audio player
...
Tested on OSS4 (4front), FreeBSD 7.2 OSS and with ALSA's OSS emulation.
Bear with me, this is both my first serious C++ and OSS code.
Originally committed to SVN as r3497.
2009-09-08 22:06:07 +00:00
Amar Takhar
b258daa120
Add the new icons + new source paths to EXTRA_DIST, it was still set to the XPMs.
...
Originally committed to SVN as r3496.
2009-09-06 02:39:32 +00:00
Amar Takhar
a5730828d3
Remove __APPLE__ around SetBitmap() in AppendBitmapMenuItem, this gives us pretty icons in our menus on osx.
...
Originally committed to SVN as r3495.
2009-09-06 00:41:38 +00:00
Amar Takhar
c89dcae7fc
Don't attempt to draw a NULL bitmap, OSX doesn't like this. (i'd gather that none of the other platforms do either but on osx it causes a crash.
...
Originally committed to SVN as r3488.
2009-09-05 04:06:38 +00:00
Amar Takhar
53b3f8468c
Remove old MacRegisterDefaultTypeAndCreator that no longer wxist in wxCocoa. Add a note about how this is handled on unix and a todo item for fixing this on OSX.
...
Originally committed to SVN as r3487.
2009-09-05 03:56:45 +00:00
Amar Takhar
e545c96dc8
OSX doesn't like it when combo boxes are empty, so init styles to "Default" and actor to "Actor".
...
Originally committed to SVN as r3485.
2009-09-05 02:24:52 +00:00
Amar Takhar
2d96c5bf4b
Remove a bunch of __WXMAC__ entries that are no longer required.
...
* Options uses a TreeBook like every other platform
* Browse button now works in osx
* wxGLCanvas is now the same as windows/unix
Originally committed to SVN as r3484.
2009-09-05 01:16:23 +00:00
Amar Takhar
878f451d72
Remove an old hack required for wx2.8, this is no longer required for 2.9. Closes #850 .
...
Originally committed to SVN as r3483.
2009-09-04 05:12:49 +00:00
Amar Takhar
1155d1bcf8
wxUSE_STACKWALKER is defined to 0/1, so #ifdef doesn't work. (noticed by plork)
...
Originally committed to SVN as r3474.
2009-09-03 06:03:38 +00:00
Amar Takhar
95812a6c79
Mark DecodePathMaybeRelative as depreciated this is a legacy function that's a pain and no longer required for 2.2 it needs to be removed eventually.
...
Originally committed to SVN as r3473.
2009-09-03 05:27:49 +00:00
Amar Takhar
78b0765608
Vastly simplify saving of backup .ass files when crashing.
...
* Remove "Autorecovery path" option, this should not be user configurable.
* Crashes are now saved as recovered/YYYY-MM-DD-HHMMSS_<name>.ass (no pruning)
Originally committed to SVN as r3472.
2009-09-03 05:27:11 +00:00
Amar Takhar
01df6ba169
Remove the dual exception messages and strip it down to 1 short one, removing all references to crashlog.txt.
...
Originally committed to SVN as r3471.
2009-09-02 20:46:15 +00:00
Amar Takhar
bf275da4de
Revert r3462, this is the same issue as described in r3466. Someone on windows will need to sort this out.
...
Originally committed to SVN as r3470.
2009-09-02 11:03:52 +00:00
Amar Takhar
65d2eda681
Silence warnings in MatroskaParser.c
...
Originally committed to SVN as r3469.
2009-09-02 10:06:25 +00:00
Amar Takhar
4aa6975a8d
Whoops, I mis-placed the parentheses in r3458.
...
Originally committed to SVN as r3468.
2009-09-02 10:04:36 +00:00
Amar Takhar
46c824442b
Remove useless typedef
...
Originally committed to SVN as r3467.
2009-09-02 10:04:03 +00:00
Amar Takhar
e1a23412ac
Revert r3461.. on unix iconv requires const char**, however for whatever reason msvc is complaining it can't convert it to char**. I have no idea why someone on windows will have to debug it.
...
Originally committed to SVN as r3466.
2009-09-02 09:40:52 +00:00
Amar Takhar
430286cf69
Silence warnings for the pulseaudio player.
...
Originally committed to SVN as r3465.
2009-09-02 09:00:03 +00:00
Amar Takhar
3aa7424998
Sprinkle const to remove warnings, add {} behind a while loop.
...
Originally committed to SVN as r3464.
2009-09-02 08:48:07 +00:00
Amar Takhar
7237e44291
Switch from long to wxCoord to remove warnings.
...
Originally committed to SVN as r3463.
2009-09-02 08:45:09 +00:00
Amar Takhar
256671d666
Add (const char**) cast to inptr in iconv to silence warning.
...
Originally committed to SVN as r3462.
2009-09-02 08:41:29 +00:00
Amar Takhar
a02a63c4e5
Sprinkle const to remove warnings.
...
Originally committed to SVN as r3461.
2009-09-02 08:31:58 +00:00
Amar Takhar
89284f5a1c
Sprinkle const to remove warnings.
...
Originally committed to SVN as r3460.
2009-09-02 08:28:30 +00:00
Amar Takhar
2bd2b7f3a3
Add empty {}'s after while statements to silence warnings (and for safety!
...
Originally committed to SVN as r3459.
2009-09-02 08:26:52 +00:00
Amar Takhar
a16c8ed838
Add parentheses to silence warning. (and for clarity)
...
Originally committed to SVN as r3458.
2009-09-02 08:23:18 +00:00
Amar Takhar
24c7ceb0ab
Add parentheses to silence warning. (and for clarity)
...
Originally committed to SVN as r3457.
2009-09-02 08:21:09 +00:00
Amar Takhar
aacc50702f
Add empty {}'s after while statements to silence warnings (and for safety!
...
Originally committed to SVN as r3456.
2009-09-02 08:19:24 +00:00
Amar Takhar
586f2297fc
Add const to langs[] to silence warnings.
...
Originally committed to SVN as r3455.
2009-09-02 08:18:11 +00:00
Amar Takhar
eceb72d95e
Add (const char*) to silence warning to strcmp.
...
Originally committed to SVN as r3454.
2009-09-02 08:10:59 +00:00
Amar Takhar
eb807fea3d
Add (char *) before string constant to silence warning. to ass_read_memory.
...
Originally committed to SVN as r3453.
2009-09-02 08:06:51 +00:00
Amar Takhar
77e2eaef04
Comment two unused variables to silence warnings.
...
Originally committed to SVN as r3452.
2009-09-02 08:04:45 +00:00
Amar Takhar
aef7375ddb
* Add a new define WITH_EXCEPTIONS to allow exception handling to be forced on when in debug mode.
...
* Add --enable-debug-exceptions to set WITH_EXCEPTIONS.
* Fix precompiled header msg using AC_RESULT. (forgot this in the original patch)
Originally committed to SVN as r3451.
2009-09-02 07:59:17 +00:00
Grigori Goronzy
a9b80dea4c
Update libass and adjust to API changes.
...
Update the internal libass copy to git commit cf7c6e4c and fix the
libass provider; libass types were renamed.
Originally committed to SVN as r3446.
2009-09-02 01:23:51 +00:00
Niels Martin Hansen
64c642c142
Revert r3431, it breaks the clipboard on Windows and is in fact also incorrect usage of the primary selection in X11 context. (I have never heard of anyone claiming clipboard usage not working on X11 before.)
...
This comment is in `include/wx/clipbrd.h`:
{{{
// this allows to choose whether we work with CLIPBOARD (default) or
// PRIMARY selection on X11-based systems
//
// on the other ones, working with primary selection does nothing: this
// allows to write code which sets the primary selection when something is
// selected without any ill effects (i.e. without overwriting the
// clipboard which would be wrong on the platforms without X11 PRIMARY)
}}}
Note that it says that primary selection enabled causes the clipboard to do nothing on platforms that have no concept of primary selection, such as Windows and Mac.
On X11 the primary selection should only reflect an active selection of text (or similar) that the user has performed, and the contents of the primary selection buffer will essentially change all the time as the user changes selection. When the user chooses to explicitly copy something to the clipboard (as is the case with Aegisub, the only operation supported by us currently) the data is placed in a less ephemeral buffer which is the actual clipboard, separate from the primary selection, allowing the user to change the primary selection further without affecting the clipboard.
Originally committed to SVN as r3443.
2009-08-28 21:45:01 +00:00
Niels Martin Hansen
b1225cdd1f
Correct a use of wx event handling, which should also make FrameMain not require friend access to AudioDisplay.
...
Originally committed to SVN as r3442.
2009-08-28 21:15:39 +00:00
Amar Takhar
28a79d49ac
Whoops, I nuked the reference counter initilisation by accident. in r3440.
...
Originally committed to SVN as r3441.
2009-08-25 05:31:20 +00:00
Amar Takhar
3eff6459cb
* Clean up doxygen comments.
...
* Fix spacing between blocks.
* Add some debugging info.
Originally committed to SVN as r3440.
2009-08-25 05:17:07 +00:00
Amar Takhar
e0f84274b0
Add the languages button that was missed in r3437.
...
Originally committed to SVN as r3439.
2009-08-22 03:59:09 +00:00
Amar Takhar
3de6c63ddd
Reformat the 'Enter aspect ratio' text to be formatted as a block rather than a very wide string that looked silly.
...
Originally committed to SVN as r3438.
2009-08-22 03:56:02 +00:00
Amar Takhar
775c73de29
Add new icons from Kaverin.
...
Originally committed to SVN as r3437.
2009-08-22 03:51:00 +00:00
Amar Takhar
0def838ef2
Add modified buttons from r3435.
...
Originally committed to SVN as r3436.
2009-08-22 03:50:12 +00:00
Amar Takhar
8ba5aa27be
Move stream position info into it's own struct.. Looks like a few globals can't be helped due to how the AudioPlayer class is designed. If I have to use globals I'll atleast make them easier to manage.. Updates #997 .
...
Originally committed to SVN as r3434.
2009-08-21 21:40:18 +00:00
Amar Takhar
5ea99a65e7
Remove unused global 'stopping' and remove unused mutex code. Updates #997 .
...
Originally committed to SVN as r3433.
2009-08-21 20:28:43 +00:00
Amar Takhar
2df6b2fd38
Remove 'playing' global in favour of an IsPlaying function that uses Pa_IsStreamActive(). Updates #997 .
...
Originally committed to SVN as r3432.
2009-08-21 20:08:58 +00:00
Amar Takhar
f5a9af6a6c
Call wxTheClipboard->UsePrimarySelection(true) when using wxClipboard, without getting into detail clipboard work very differently on X11. Without calling this copying to the clipboard won't work. I've just put it after every use of ->Open, this is safe as in every case Close() is called right after. This will fix clipboard copying on all unices.
...
Originally committed to SVN as r3431.
2009-08-20 02:31:33 +00:00
Amar Takhar
50d9dbd4f1
Add detach_video_menu and show_overscan_menu_checked <- this one isn't in use as you can't Check() a menu item that has a bitmap, we need to figure out an alternate solution. This probably involves flipping the bitmap to our own of a checkmark.
...
Originally committed to SVN as r3430.
2009-08-19 07:03:39 +00:00
Amar Takhar
2bf5f6656e
Commit modified buttons from r3428.
...
Originally committed to SVN as r3429.
2009-08-19 06:48:50 +00:00