5338a60cdb
Fix compilation errors when not using precompiled headers
...
Originally committed to SVN as r4511.
2010-06-14 19:26:27 +00:00
461616a47f
Hook up default_path.json to the build
...
Originally committed to SVN as r4491.
2010-06-13 01:43:19 +00:00
f497144525
Fix syntax errors
...
Originally committed to SVN as r4490.
2010-06-13 01:42:50 +00:00
c95eb3fcce
universalchardet is no longer optional.
...
Originally committed to SVN as r4481.
2010-06-12 05:29:01 +00:00
ccdc863496
Fix copy/paste error in r4244
...
Originally committed to SVN as r4479.
2010-06-11 02:25:40 +00:00
40da39e1c8
Make updating the subtitle preview window roughly 50% faster
...
Originally committed to SVN as r4478.
2010-06-11 02:25:34 +00:00
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
72cbf4939f
Fix flickering in color picker
...
Originally committed to SVN as r4476.
2010-06-11 02:25:23 +00:00
c290b6b811
Silence some prefast warnings
...
Originally committed to SVN as r4472.
2010-06-11 02:24:59 +00:00
bc40eeb827
Don't use a wxChar for exception messages.
...
Originally committed to SVN as r4471.
2010-06-10 04:52:47 +00:00
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
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
9a3e1c58f0
Use an std::string for now when printing messages.
...
Originally committed to SVN as r4467.
2010-06-09 02:06:37 +00:00
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
653ce8b13d
Fix misspelled option name
...
Originally committed to SVN as r4464.
2010-06-08 12:07:56 +00:00
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
c7da8d9f61
Store OptionValues used by VideoContext
...
Originally committed to SVN as r4462.
2010-06-08 06:09:13 +00:00
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
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
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
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
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
1b27b77ac3
Add glext.h to the precompiled header
...
Originally committed to SVN as r4455.
2010-06-07 07:24:25 +00:00
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
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
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
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
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
eff4dcf404
Fix might-as-well-be-inifinite loop in VisualToolVectorClip
...
Originally committed to SVN as r4431.
2010-06-04 03:08:10 +00:00
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
88f6bca9d7
Make ASS tag parsing ~50% faster.
...
Originally committed to SVN as r4429.
2010-06-04 03:07:58 +00:00
f001651865
Replace AssDialogueBlock::GetAsOverride etc. with dynamic_cast
...
Originally committed to SVN as r4428.
2010-06-04 03:07:52 +00:00
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
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
625ce943f5
Cache OptionValue objects used by the video display
...
Originally committed to SVN as r4425.
2010-06-04 03:07:33 +00:00
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
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
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
71300869da
Fix order that VisualToolVectorClip's members are initialized
...
Originally committed to SVN as r4421.
2010-06-03 20:32:10 +00:00
ca24f60a7e
Fix memory leak when exporting a file fails
...
Originally committed to SVN as r4420.
2010-06-03 20:32:03 +00:00
f064624ecd
Simplify charset detection
...
Originally committed to SVN as r4419.
2010-06-03 20:31:43 +00:00
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
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
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
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
6c13d8f250
Fix merge error in r4401.
...
Originally committed to SVN as r4403.
2010-06-02 22:54:38 +00:00
9767b715ca
Explicitly initialize VisualToolScale's members
...
Originally committed to SVN as r4402.
2010-06-02 07:22:59 +00:00
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
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
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
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
ac42fcda5d
Fix undo problems with cross and drag visual tools.
...
Originally committed to SVN as r4388.
2010-06-01 03:21:25 +00:00
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
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
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
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
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
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
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
e120ecc190
Make move/pos toggle modify all selected lines
...
Originally committed to SVN as r4364.
2010-05-26 07:17:46 +00:00
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
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
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
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
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
e9c806d0de
Handle libass messages with wxLog* family of functions
...
Originally committed to SVN as r4357.
2010-05-24 03:41:06 +00:00
61ab7d1f2c
Fix ALSA player compilation. (missing includes)
...
Originally committed to SVN as r4355.
2010-05-24 01:46:04 +00:00
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
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
9157465a18
Fix loading video/keyframes/timecodes from the MRU list.
...
Originally committed to SVN as r4338.
2010-05-21 04:40:38 +00:00
68914197d5
Re-add local config file support for standalone installations.
...
Originally committed to SVN as r4335.
2010-05-21 03:52:11 +00:00
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
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
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
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
2ef8302a6d
Add boost/shared_pointer.hpp to the precompiled header
...
Originally committed to SVN as r4319.
2010-05-20 08:55:41 +00:00
40a0c8994a
Simplify the VisualTool interface a bit.
...
Originally committed to SVN as r4318.
2010-05-20 08:55:35 +00:00
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
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
2ec4a97dbb
Fix bad coordinate conversion in the clip visual tool
...
Originally committed to SVN as r4315.
2010-05-20 08:55:18 +00:00
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
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
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
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
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
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
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
a573b0897b
Add "Open Subtitles From Video" menu option. Closes #253 .
...
Originally committed to SVN as r4306.
2010-05-19 00:44:37 +00:00
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
49abae2698
Fix a merge conflict and some newline issues
...
Originally committed to SVN as r4290.
2010-05-16 07:06:08 +00:00
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
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
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
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
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
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
290353d467
Bump copyright years on video_display.*
...
Originally committed to SVN as r4277.
2010-05-13 18:37:41 +00:00
5215049c07
Add mouse wheel video zooming
...
Originally committed to SVN as r4276.
2010-05-13 18:37:35 +00:00
f002850e17
Fix distfile creation.
...
Originally committed to SVN as r4260.
2010-05-06 16:05:34 +00:00
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
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
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
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
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
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
ae82498273
Make a few parameters in gl_text const references
...
Originally committed to SVN as r4252.
2010-04-30 16:15:18 +00:00
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
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
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
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
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
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
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
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
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
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
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
0a8a495aea
Fix a smattering of memory leaks.
...
Originally committed to SVN as r4157.
2010-02-25 21:45:39 +00:00
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
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
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
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
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
65b09da334
Add missing include.
...
Originally committed to SVN as r4107.
2010-02-15 03:06:04 +00:00
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
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
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
621cefe14e
Fix compile error on non-windows caused by r4097.
...
Originally committed to SVN as r4099.
2010-02-14 18:06:56 +00:00
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
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
48e321f8ef
Juggle a weird control structure to be more regular.
...
Originally committed to SVN as r4086.
2010-02-05 16:06:37 +00:00
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
702739b32e
Doxygen-document DSound2 audio player
...
Originally committed to SVN as r4083.
2010-02-05 14:51:12 +00:00
fe65749623
Merge r4081, closes #1126 .
...
Originally committed to SVN as r4082.
2010-02-05 13:22:43 +00:00
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
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
ba0cf4463f
Delete gcc precompiled headers in distclean.
...
Originally committed to SVN as r4072.
2010-01-30 16:59:24 +00:00
5db8abd330
OSS player: convert device name to UTF-8 string.
...
Originally committed to SVN as r4071.
2010-01-30 15:08:50 +00:00
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
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
b822ec6343
Merge translations from 2.1.8.
...
Originally committed to SVN as r4047.
2010-01-26 13:43:02 +00:00
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
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
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
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
ba088237d7
Add some documentation for AegisubCSConv and TextFileReader.
...
Originally committed to SVN as r4036.
2010-01-24 18:56:51 +00:00
c7d95e5590
Add greg to the about dialog credits.
...
Originally committed to SVN as r4035.
2010-01-24 02:37:47 +00:00
f43bff1e97
merge r4003 (options dialogue layout fixes)
...
Originally committed to SVN as r4021.
2010-01-21 00:28:07 +00:00
89e2428dbe
merge r3992 (restart-helper fixes)
...
Originally committed to SVN as r4020.
2010-01-21 00:26:45 +00:00
4221919d4f
merge r3983,r4002 (more string fixes.)
...
Originally committed to SVN as r4019.
2010-01-21 00:24:59 +00:00
79c1716ccd
merge r3982.
...
Originally committed to SVN as r4017.
2010-01-21 00:01:46 +00:00
e76cfae9bb
Merge r3974: asserts in colour picker dialog.
...
Originally committed to SVN as r4015.
2010-01-20 22:49:26 +00:00
f1fa69d528
Merge r3999 to trunk, updates #566 .
...
Also, 4000 GET.
Originally committed to SVN as r4000.
2010-01-19 08:50:40 +00:00
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
8c8f59b5ff
Fix ALSA player. Works On My Computer [tm].
...
Originally committed to SVN as r3990.
2010-01-15 22:58:51 +00:00
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
7e079a3fc2
Merge r3967 from 2.1.8, closes #971 .
...
Originally committed to SVN as r3968.
2010-01-10 16:15:31 +00:00
8c036dfc3b
Merge r3965 back in trunk. Closes #791 .
...
Originally committed to SVN as r3966.
2010-01-10 16:02:01 +00:00
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
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
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
dbc885fdb0
Merge r3929 to fix the video slider, updates #1073 .
...
Originally committed to SVN as r3939.
2010-01-05 00:51:53 +00:00
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
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
54ff8124b6
Merge r3907 back to trunk, closes #1072
...
Originally committed to SVN as r3908.
2009-12-27 19:49:27 +00:00
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
face7faec3
Fix bundledirs-test target.
...
Originally committed to SVN as r3896.
2009-12-25 03:31:01 +00:00
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
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
a49aa20a22
Merge r3891 (hunspell path fix.)
...
Originally committed to SVN as r3892.
2009-12-24 18:16:19 +00:00
2f2f0d9aac
Fix some assorted VideoOutGL-related stupidity. Updates #1056 .
...
Originally committed to SVN as r3864.
2009-12-13 19:27:45 +00:00
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
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
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
fc75937466
Make some non-mutating hotkey methods const.
...
Originally committed to SVN as r3852.
2009-12-05 04:26:07 +00:00
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
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
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
86f64b2962
Improve video operation errors somewhat. Updates #1020 .
...
Originally committed to SVN as r3835.
2009-12-01 00:32:43 +00:00
dadd09ff49
Remove SetCacheMax() function as it is no longer used.
...
Originally committed to SVN as r3833.
2009-11-29 19:12:40 +00:00
e38b00fb51
Update documentation according to changes in r3831.
...
Originally committed to SVN as r3832.
2009-11-29 19:09:55 +00:00
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
ed3b47b250
document new function introduced in r3829
...
Originally committed to SVN as r3830.
2009-11-29 19:01:32 +00:00
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
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
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
653427fbad
Update ffms2 to r234, part 2. Compilation fixed again.
...
Originally committed to SVN as r3815.
2009-11-21 21:15:02 +00:00
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
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
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
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
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
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
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
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
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
3c75547292
Make "Untitled" and "untitled" translateable, updates #792 .
...
Originally committed to SVN as r3761.
2009-11-04 05:27:09 +00:00
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
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
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
Thomas Goyne