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

2618 commits

Author SHA1 Message Date
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
Amar Takhar
401560b190 Add some debug trace info. 
Originally committed to SVN as r4418.
 2010-06-03 18:09:00 +00:00
Niels Martin Hansen
709718ffb6 Lesson: Don't code when tired. 
Make a complete function call of the notify loop body, instead of some half syntax.

Originally committed to SVN as r4417.
 2010-06-03 18:08:23 +00:00
Amar Takhar
1768a8138d Whoops, remove an artifact that remained when debugging: don't delete the message buffer. 
Originally committed to SVN as r4416.
 2010-06-03 08:32:42 +00:00
Niels Martin Hansen
5e8d5b221b Compiling, but untested, option change notifications. Doesn't seem to affect Aegisub aversely. 
Has the limitation that one object can only subscribe once to one option value, but that shouldn't actually be a problem. (One object cannot have two different of its member functions subscribing to one option value.)

Originally committed to SVN as r4415.
 2010-06-03 05:07:47 +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
86a3d0792a Move */ up one line so it doesn't catch the closing brace for EmitSTDOUT::log 
Originally committed to SVN as r4411.
 2010-06-03 01:18:12 +00:00
Amar Takhar
3ba76f196f Commit a bunch of changes msvc wants to make anytime I open the solution: it's driving me nuts. 
Originally committed to SVN as r4410.
 2010-06-03 01:17:15 +00:00
Amar Takhar
61ee7ce92d Fill in time_log() with code from http://www.suacommunity.com/dictionary/gettimeofday-entry.php <-thanks! 
Originally committed to SVN as r4409.
 2010-06-03 01:09:41 +00:00
Amar Takhar
b40d709924 Add dialog_log.(cpp|h) to the build: It's *very* annoying how msvc decides to randomly write nonsense config settings to the project. 
Originally committed to SVN as r4408.
 2010-06-03 01:06:05 +00:00
Amar Takhar
f6bf25c397 Change the object for windows/log.cpp to log_windows.obj -- I'm starting to dislike msvc more and more, how can people develop using this program? 
Originally committed to SVN as r4407.
 2010-06-03 01:03:17 +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
Amar Takhar
fc9e01c68a * Forward declare the LogSink global 
* Change GetSink() to return a const pointer.

Originally committed to SVN as r4405.
 2010-06-02 23:45:51 +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
798e18490d Add windows/log.cpp to the libaegisub project. 
Originally committed to SVN as r4398.
 2010-06-01 08:19:51 +00:00
Amar Takhar
33011cb5ed Split EmitterSTDOUT into unix/log.cpp and windows/log.cpp, the windows version is commented at the moment. 
Originally committed to SVN as r4397.
 2010-06-01 08:17:27 +00:00
Amar Takhar
139f675ede Add a return value to LogSink::Subscribe to make msvc happy. 
Originally committed to SVN as r4396.
 2010-06-01 08:08:33 +00:00
Amar Takhar
8eded1e7c6 Update project file, this should have been done in r4394. 
Originally committed to SVN as r4395.
 2010-06-01 08:03:51 +00:00
Amar Takhar
7e83443c3e Fix the Windows build, there are a couple of things to note: 
* I rebroke the stdout logger I'll fix that in unix.
 * There is a new header libaegisub/types.h which is a temp solution until I sort out something more realistic.  It's too early to tell what the proper solution will be.

Originally committed to SVN as r4394.
 2010-06-01 08:03:17 +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
Amar Takhar
badee30d17 Sigh, not diffing before committing bites me again: remove useless deltas that shouldn't have been committed. 
Originally committed to SVN as r4392.
 2010-06-01 05:14:00 +00:00
Amar Takhar
37b904b75e Create time_log() to return a timeval so I can implement this on windows as well. 
Originally committed to SVN as r4391.
 2010-06-01 05:11:18 +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
3ff3fdf4cc Fix the stdout print to make it more readable.. 
Originally committed to SVN as r4376.
 2010-05-31 23:16:16 +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
0a453fe127 Move Serverity_ID below the definition of log where it should be. 
Originally committed to SVN as r4373.
 2010-05-31 22:47:38 +00:00
Amar Takhar
9d0c5a4890 Add Googles mutex.h which seems to be used in many of googles projects. It's better to use something that's well-tested rather than rolling our own. Also a huge time saver. 
Originally committed to SVN as r4372.
 2010-05-31 21:57:08 +00:00
Amar Takhar
9393850884 Commit the beginings of a logging api, this is fairly complete however it has no locking. 
Originally committed to SVN as r4371.
 2010-05-31 20:55:29 +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
Amar Takhar
9d854b69f3 Don't bother storing storing a single charset into an std::string, instead insert it into the std::map and fix Single() to return the first element. This keeps things simple and also ensures that DetectAll() will always return atleast one element which wasn't being done before. 
Originally committed to SVN as r4369.
 2010-05-28 13:08:00 +00:00
Amar Takhar
6736f5e292 Add a change that was missed in r4367. 
Originally committed to SVN as r4368.
 2010-05-28 08:04:55 +00:00
Amar Takhar
e408fe49c9 Add support for detecting character sets using UniversalChardet -- this superceeds character_detect.cpp. 
Originally committed to SVN as r4367.
 2010-05-28 07:40:21 +00:00
Amar Takhar
8dab221f8b Bring universalchardet up to 41661:ea9bbf0ff87f (2010-03-13). 
Originally committed to SVN as r4366.
 2010-05-27 02:20:34 +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
Amar Takhar
d171d0aef8 Add a regression test for r4347. 
Originally committed to SVN as r4358.
 2010-05-24 05:58:46 +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
8f67d48487 Initial support for external libass with pkg-config 
This introduces the configure option --with-external-libass; the
internal copy is still used by default. Fixes #917.

Originally committed to SVN as r4356.
 2010-05-24 02:44:31 +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
Amar Takhar
25497cf87d Completely remove the usage of POSIX functions from Acs. I've discovered the hard way that most things POSIX on Windows is a complete disaster. 
With this we're now using native functions and all unit tests pass.

The code used in Check() is still a proof of concept and will probably be rewritten as issues are exposed.

Originally committed to SVN as r4354.
 2010-05-23 20:39:14 +00:00
Amar Takhar
69ae630488 Fix binary name: s/aegisub/test/ 
Originally committed to SVN as r4353.
 2010-05-23 20:21:05 +00:00
Amar Takhar
fc77763e95 Wrap the initial construction test with EXPECT_NO_THROW(), this will ensure any underlying exceptions are caught. The other tests need similar fixes which I'll look to later on unix. 
Originally committed to SVN as r4352.
 2010-05-23 20:12:34 +00:00
Amar Takhar
c65de83b26 Remove empty quotes, I forgot DOS echo doesn't require it. 
Originally committed to SVN as r4351.
 2010-05-23 20:06:47 +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
0dc6a082ca Fix memory leaks in Option 
Originally committed to SVN as r4349.
 2010-05-23 06:58:11 +00:00
Thomas Goyne
60a1bdc2df Fix memory leaks in mru.cpp 
Originally committed to SVN as r4348.
 2010-05-23 06:58:06 +00:00
Thomas Goyne
9fc28fc1d4 Make MRUManager::Remove work 
Originally committed to SVN as r4347.
 2010-05-23 06:58:01 +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
Amar Takhar
f7f59e5e1d Add an ErrorString utility which converts the code from GetLastError() into a human readable std::string. 
Originally committed to SVN as r4345.
 2010-05-22 21:09:37 +00:00
Amar Takhar
12711d8c12 * Add util_windows.cpp to test project. 
* Fix typo in util_windows.cpp.

Originally committed to SVN as r4344.
 2010-05-22 01:41:23 +00:00
Amar Takhar
ad005c3a9c Split unix/windows code into seperate files to preserve sanity. 
Originally committed to SVN as r4343.
 2010-05-22 01:38:07 +00:00
Amar Takhar
810ffa09c7 Convert the identifier to an std::string from wxString. For whatever reason wxString is producing addresses rather than strings when automatically converting. I've seen this behaviour before and it seems quite random. This will solve that problem. 
Originally committed to SVN as r4342.
 2010-05-22 01:22:53 +00:00
Amar Takhar
cb1a82baaa * Add a post build event to setup the unit test resource directory. 
* Fix the build target, for some reason this isn't being taken from the property sheet jfs will have to look at it later..

Originally committed to SVN as r4341.
 2010-05-21 17:33:04 +00:00
Amar Takhar
c1ad93ce93 Add a project for the unit tests.. this is incomplete (progress save) 
Originally committed to SVN as r4340.
 2010-05-21 06:06:46 +00:00
Amar Takhar
6a15775401 Add a temp (and ugly) workaround to get this building on windows. I'll make a proper solution when i next work on this file. (soonish) 
Originally committed to SVN as r4339.
 2010-05-21 06:03:20 +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
Amar Takhar
a584361bb8 Add a few missing redirects. 
Originally committed to SVN as r4337.
 2010-05-21 04:03:43 +00:00
Amar Takhar
580bdb8271 Add a windows equivalent of setup.sh 
Originally committed to SVN as r4336.
 2010-05-21 04:02:08 +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
Thomas Goyne
d3c33d5e7c Fix file saving on Windows. 
Originally committed to SVN as r4333.
 2010-05-21 03:07:48 +00:00
Amar Takhar
cd8305987b Wrap io.h with _MSC_VER since it's only needed on windows. Eventually we'll have to create our own set of defined macros for various platforms. 
Originally committed to SVN as r4332.
 2010-05-21 01:19:40 +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
ea100e9bff Add simple automation macros to strip override tags and select overlapping lines. Closes #120. 
Originally committed to SVN as r4305.
 2010-05-19 00:44:31 +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
81282bf06e Add LICENCE to EXTRA_DIST. 
Originally committed to SVN as r4261.
 2010-05-06 16:07:00 +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
aa417cf903 Remove unintentionally added tabs. 
Originally committed to SVN as r4174.
 2010-03-13 18:16:40 +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
Kevin Ollivier
277f1959ad We should still increment currentItem when the file and dir tests both return false, as otherwise we get into infinite recursion processing the same item. 
Originally committed to SVN as r4172.
 2010-03-13 17:43:47 +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
Thomas Goyne
409bcc561a Update the windows build system to work with the changes made in r4169. 
Originally committed to SVN as r4170.
 2010-03-03 01:28:47 +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
Amar Takhar
e4364ae6f9 Fix typo. (from kovensky), should be merged to 2.1.9 
Originally committed to SVN as r4164.
 2010-03-01 19:36:57 +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
cb8cafadbd Add video/script resolution correct factor to karaskel, updates #1139. 
Originally committed to SVN as r4087.
 2010-02-05 17:31:18 +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
Niels Martin Hansen
8d5cde185d Fix rare furigana layout issue. Updates #1144. 
Originally committed to SVN as r4079.
 2010-02-05 12:51:20 +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
Grigori Goronzy
f84b51531a Merge r4006 back intro trunk. 
Originally committed to SVN as r4069.
 2010-01-30 13:43:25 +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
5ebab7adba Update aegisub.pot + .po files in preperation for merging the translations from 2.1.8 to trunk. 
Originally committed to SVN as r4046.
 2010-01-26 13:38:54 +00:00
Amar Takhar
eece24e293 Delete all .mo files, we'll be generating these on build time see #1076. 
Originally committed to SVN as r4045.
 2010-01-26 13:22:14 +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
4a42ab1403 merge r4011,r4012 (Switch from Mac::Finder::DSStore to using AppleScript) 
Originally committed to SVN as r4025.
 2010-01-21 00:37:04 +00:00
Amar Takhar
e247dec1f3 Merge r4010,r4013,r4014 (configure and bundle/dmg generation fixes.) 
Originally committed to SVN as r4024.
 2010-01-21 00:34:45 +00:00
Amar Takhar
113ae0cd6d merge r4007 (optimisation flag fix.) 
Originally committed to SVN as r4023.
 2010-01-21 00:30:42 +00:00
Amar Takhar
73ab47f8ec merge r3986 (configure release support. 
Originally committed to SVN as r4022.
 2010-01-21 00:29:26 +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
Amar Takhar
361f5228ba Merge r3977 (osx-fix-libs) from 2.1.8 closes #964. 
Originally committed to SVN as r3978.
 2010-01-12 13:00:24 +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
Grigori Goronzy
e341e05fa2 Update libass to commit 8db4a5. 
Originally committed to SVN as r3970.
 2010-01-10 21:09:48 +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
Amar Takhar
931326e3c0 Add 1020 to license header, happy new year! 
Originally committed to SVN as r3922.
 2010-01-01 21:10:34 +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
e00936c3bf Add AC_PROG_RANLIB to configure.in, fixes 'make distclean' 
Originally committed to SVN as r3898.
 2009-12-25 04:31:59 +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
Amar Takhar
660e392423 Update chinese translation -- this is an old version that was updated 2 days after the original submission. Unfortunatly it was never comitted. 
Originally committed to SVN as r3887.
 2009-12-22 19:18:29 +00:00
Amar Takhar
13761bd65e Add fi and zh_CN to LINGUAS. 
Originally committed to SVN as r3886.
 2009-12-22 18:52:33 +00:00
Amar Takhar
ebc9222f32 Merge r3879. 
Originally committed to SVN as r3880.
 2009-12-22 05:21:32 +00:00
Amar Takhar
ec6053a674 Merge r3877. 
Originally committed to SVN as r3878.
 2009-12-22 04:19:27 +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
Amar Takhar
fedd8ecce6 Commit a different patch than the one in #1064.. this sets the default automake required version to 1.10.. the detection for 1.11 is *after* 1.11 because we prefer to use that, though we do prefer to use 1.11 than 1.9 if it's available. Updates #1064 
Originally committed to SVN as r3862.
 2009-12-13 17:47:19 +00:00
Amar Takhar
608a73677d Remove /usr/share/fonts and /usr/X11R6/lib/fonts from fonts.conf. These will never be used under OSX they're for Unix and X respectivly. /usr/share/fonts is only useful for Unix users and the X path is useless under Aqua. 
Originally committed to SVN as r3860.
 2009-12-12 03:47:51 +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
Amar Takhar
0c34323b5d Hopefully this is the last test. 
Originally committed to SVN as r3828.
 2009-11-29 14:01:57 +00:00
Amar Takhar
ddcb31cfa9 How much whitespace does it take... (another test.) 
Originally committed to SVN as r3827.
 2009-11-29 13:31:38 +00:00
Amar Takhar
1834434b13 Another commit to test the buildbot. 
Originally committed to SVN as r3826.
 2009-11-29 13:27:56 +00:00
Amar Takhar
7709a5bbb4 Bunk commit to test the buildbot. 
Originally committed to SVN as r3825.
 2009-11-29 13:16:08 +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
b8561bf01d Update ffms2 to r238. Fixes #1048. This version is API and ABI compatible with the previous one so no further modifications are necessary. 
Originally committed to SVN as r3820.
 2009-11-28 20:04:06 +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
Karl Blomster
1f4fa82726 Update ffms2 to r234, part 1. Compilation broken in this commit. 
Originally committed to SVN as r3814.
 2009-11-21 21:11:41 +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
Amar Takhar
9a4db2b466 Use the two new macros to supply auto-detection for lua. updates #989. 
Originally committed to SVN as r3802.
 2009-11-17 04:47:26 +00:00
Amar Takhar
932a7777be Add two new macros (custom) to search for headers in different directories and libraries with different names. updates #989. 
Originally committed to SVN as r3801.
 2009-11-17 04:46:46 +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
Niels Martin Hansen
d6b0cdcedf Blind but most likely correct fix missing \iclip support in cleantags.lua. Updates #1044. 
Originally committed to SVN as r3772.
 2009-11-13 22:13:58 +00:00
Amar Takhar
ab857d115c Add libffms/include/*.h to the list of sources so the headers get included, found by rofflwalffls on irc, thanks! 
Originally committed to SVN as r3769.
 2009-11-07 03:08:49 +00:00
Amar Takhar
78ccb785cc Fill in license information, updates #1029. 
Originally committed to SVN as r3766.
 2009-11-05 04:24:25 +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
Amar Takhar
88d6c783b1 Remove boost.m4 from EXTRA_DIST it was nuked a long time ago. 
Originally committed to SVN as r3756.
 2009-11-02 21:44:08 +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
810c0a7eb0 Add an empty config.h and remove ../src from the build. We don't want to pollute libass with our config settings. 
Originally committed to SVN as r3745.
 2009-10-28 00:30:42 +00:00
Amar Takhar
b2649ab510 Add libass license 
Originally committed to SVN as r3744.
 2009-10-28 00:30:12 +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
Amar Takhar
c72ac65d0f Fix --enable-gcov: 
* Rename GCOV_FLAGS -> GCOV_CFLAGS
 * Add GCOV_LDFLAGS (default is -lgcov)

Originally committed to SVN as r3724.
 2009-10-20 03:35:42 +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
Amar Takhar
ddc3b57694 How lazy can I get for not regening configure to test this change... (yes, i did this time around.) Updates #1023. 
Originally committed to SVN as r3703.
 2009-10-12 06:06:44 +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
Amar Takhar
669e11d10b Remove boost check as ffms has removed the usage of boost::format. This is trunk-only for now. Updates #1023. 
Originally committed to SVN as r3691.
 2009-10-12 00:14:36 +00:00
Karl Blomster
e3583da740 Update ffms2 to r228. Removes the boost dependency. 
Originally committed to SVN as r3690.
 2009-10-12 00:11:15 +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
3873c4fc4e Remove @BOOST_CPPFLAGS@ as the boost detection is now disabled. 
Originally committed to SVN as r3664.
 2009-10-09 16:10:59 +00:00
Amar Takhar
2623b8380f Update universalchardet to 29631:4dd0cf2ba86f (2009-06-27). Closes #866. 
Originally committed to SVN as r3662.
 2009-10-09 15:37:55 +00:00
Amar Takhar
61c3a3149e Remove boost check, the macro I'm using has serious bugs that only shows up on some systems. 
Originally committed to SVN as r3660.
 2009-10-09 15:22:06 +00:00
Amar Takhar
7a53f7dd43 Fix a const issue in JpCntx.h. 
Originally committed to SVN as r3656.
 2009-10-09 14:50:43 +00:00
Amar Takhar
3bea135663 Check for lua.hpp usability not lua.h, Updates #998. 
Originally committed to SVN as r3654.
 2009-10-09 14:43:14 +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
Amar Takhar
df259693d9 Add a check for boost which is now required by ffms.. this should be backported to 2.1.8. 
Originally committed to SVN as r3639.
 2009-10-07 01:34:47 +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
Amar Takhar
4cc6610161 Commit jfs' patch to fix rounding errors as he doesn't have trunk going at the moment. Closes #1018. 
Originally committed to SVN as r3622.
 2009-10-05 22:46:28 +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
e7465e7519 More reporter tweaks to make it actually build and run on Windows. 
Originally committed to SVN as r3619.
 2009-10-05 21:02:02 +00:00
Thomas Goyne
d677b85b66 Add required stubs for OpenGL info to the windows platform stub. 
Originally committed to SVN as r3618.
 2009-10-05 20:55:13 +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
39954493c0 Add platform_windows.h and .cpp to the project. 
Originally committed to SVN as r3614.
 2009-10-05 02:43:14 +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
Amar Takhar
0cecf3c598 Add a stub class for Windows.. whoever fills this in should take over the license. 
Originally committed to SVN as r3612.
 2009-10-03 17:45:34 +00:00
Amar Takhar
41f39f65d7 Fix locale dir under windows, I forgot to change it after copying and pasting some code from aegisub. 
Originally committed to SVN as r3611.
 2009-10-03 17:37:09 +00:00
Thomas Goyne
e1469154ea Create vcproj for reporter and make it build (but not be very useful) on windows. 
Originally committed to SVN as r3610.
 2009-10-03 17:16:52 +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
b0810a7663 Wrap() after SetFont() and don't SetMinSize() to a fixed size to calculate 
reporter window dimensions correctly.

Originally committed to SVN as r3603.
 2009-09-29 11:56:43 +00:00
Amar Takhar
c3fe549d4d Place the OpenGL info strings into their own block. OS X reports these as completely different strings it was co-incidence that the actual vendor/card info is there on FreeBSD/Linux. It's likely other operating systems (eg. Windows) does the same thing as OS X. Eventually I'll re-add vendor information for the actual card once I figure out a way to get it on BSD/OS X. 
Originally committed to SVN as r3601.
 2009-09-28 08:08:16 +00:00
Amar Takhar
84e17451f9 Fill in most of the hardware fields for MAC. 
Originally committed to SVN as r3600.
 2009-09-28 05:16:36 +00:00
Amar Takhar
b7caa012da Add list of available OpenGL extensions. 
Originally committed to SVN as r3598.
 2009-09-27 13:26:23 +00:00
Amar Takhar
c821a7e172 * Fix commandline support, I have no idea what the !OnInit block was after OnInit(), I removed it and everthing works as expected. 
* Add -x switch for dumping the report to report.xml

Unfortunatly this causes a flicker of the reporter as we need to create the main frame in order to gather some desktop metrics.

Originally committed to SVN as r3597.
 2009-09-27 11:30:29 +00:00
Amar Takhar
38d5f06821 * Move VideoInfo under private: 
* Add doxygen docs for GetVideoInfo().

Originally committed to SVN as r3595.
 2009-09-27 09:58:13 +00:00
Amar Takhar
b2a7247d01 Switch GetVideoInfo to use an enum and return a single value rather than use private member variables. There are a few reasons for this: 
* Over time too many private member variables will be hard to look at.
 * Speed isn't a concern, but code managability is.
 * I opted to create a custom enum rather than use GLenum to avoid polluting platform.h with OpenGL headers.

Originally committed to SVN as r3594.
 2009-09-27 09:50:04 +00:00
Amar Takhar
c32899df9a * Remove Video entry as duplicates what's now under Display. 
* Remove unessicary 'Video ' before renderer/version/vendor entries.
 * Put entries under Hardware->Display and bump them to the top of the list.

Originally committed to SVN as r3593.
 2009-09-27 09:27:44 +00:00
Grigori Goronzy
400365d831 Move OpenGL code down into Platform as it's portable now 
Originally committed to SVN as r3592.
 2009-09-27 04:15:41 +00:00
Grigori Goronzy
e0b36fdaff Use wxGL to make OpenGL usage portable 
Originally committed to SVN as r3591.
 2009-09-27 03:12:17 +00:00
Grigori Goronzy
9230d5360a Fix breakage due to OS X support, introduced by one of the last commits 
Originally committed to SVN as r3590.
 2009-09-27 02:18:09 +00:00
Grigori Goronzy
d64f10faa9 Split up video into vendor/renderer/version and acquire video 
adapter info via OpenGL/GLX on Unix.

Originally committed to SVN as r3589.
 2009-09-27 02:18:05 +00:00
Amar Takhar
eaf3353982 Fix location of config.dat on OSX. 
Originally committed to SVN as r3588.
 2009-09-27 01:53:42 +00:00
Amar Takhar
6a792f0635 Add support for OSX to the reporter, the base is from the BSD version which works seamlessly with the exception of different sysctl names. (not updated) 
Originally committed to SVN as r3587.
 2009-09-27 01:47:11 +00:00
Amar Takhar
e0d4dde970 Remove the actual files as well. 
Originally committed to SVN as r3586.
 2009-09-27 01:28:36 +00:00
Amar Takhar
877f908064 Remove the haali* files that were unintentionally introduced in r3575, they're windows-only. 
Originally committed to SVN as r3585.
 2009-09-27 01:26:34 +00:00
Grigori Goronzy
4d422b1997 Minor fixes to the reporter Linux support 
* drop BSD-specific includes
* document CPU cores/count vs. logical CPU count
* close files properly
* return memory size in bytes

Originally committed to SVN as r3584.
 2009-09-27 01:20:29 +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
Amar Takhar
ab269aac37 Set proper defines for the reporter. 
Originally committed to SVN as r3581.
 2009-09-27 00:23:32 +00:00
Karl Blomster
5217854199 Update ffms2 to r222. Fixes compilation with ancient ffmpeg's and is a better solution than verm's hack in r3578. 
Originally committed to SVN as r3580.
 2009-09-26 23:54:26 +00:00
Amar Takhar
16f5d0aea6 Make sure the reporter is built and installed as reporter-2.2. 
Originally committed to SVN as r3579.
 2009-09-26 23:09:39 +00:00
Amar Takhar
cf8b0ae97c Comment out a couple of lines in src/core/matroskavideo.cpp and src/core/lavfvideo.cpp to get aegisub building again, thefluff is working on a proper fix. 
Originally committed to SVN as r3578.
 2009-09-26 23:05:47 +00:00
Amar Takhar
8802e0ba3d Remove -I../src from ffms, it hasn't been needed for a very long time. 
Originally committed to SVN as r3577.
 2009-09-26 22:58:56 +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
Karl Blomster
6e39199cb4 Updating ffms2 to r221 (2.12), step 2/3: makefile 
Originally committed to SVN as r3575.
 2009-09-26 21:56:39 +00:00
Karl Blomster
6fe92bce72 Updating ffms2 to r221 (2.12), step 1/3: sources 
Originally committed to SVN as r3574.
 2009-09-26 21:56:15 +00:00
Amar Takhar
8322981b47 Use wxString in lieu of std::string to stop confusion on OSX, also makes more sense.. 
Originally committed to SVN as r3573.
 2009-09-26 21:12:15 +00:00
Amar Takhar
56ff7c2133 Fix tab alignment. 
Originally committed to SVN as r3572.
 2009-09-26 20:31:28 +00:00
Amar Takhar
3ba3955e2f Fix doxygen markup in platform_unix_linux.cpp. 
Originally committed to SVN as r3571.
 2009-09-26 20:29:25 +00:00
Amar Takhar
71065e6f66 Clarify what Features2 can be. 
Originally committed to SVN as r3570.
 2009-09-26 20:19:36 +00:00
Amar Takhar
e9c5762cf7 Remove unused header. 
Originally committed to SVN as r3568.
 2009-09-26 20:08:52 +00:00
Amar Takhar
db35bacceb Use elif instead of nested ifdefs. 
Originally committed to SVN as r3567.
 2009-09-26 20:05:54 +00:00
Amar Takhar
ecc15a9935 Add the reporter subdir to Makefile.am so it gets built. 
Originally committed to SVN as r3565.
 2009-09-26 20:00:34 +00:00
Amar Takhar
e13ca226fb Document the platform class and fix doxygen markup. 
Originally committed to SVN as r3564.
 2009-09-26 19:59:24 +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
Grigori Goronzy
a299f79515 Basic Linux support for the reporter. 
Gather basic CPU and memory information by parsing /proc/cpuinfo and
/proc/meminfo.

Originally committed to SVN as r3562.
 2009-09-26 16:44:36 +00:00
Grigori Goronzy
ce6cdd77ce Fix reporter compilation without precompiled headers 
Originally committed to SVN as r3561.
 2009-09-26 14:53:27 +00:00
Amar Takhar
4f01dab280 Add dynamic build support for *bsd and linux. 
Originally committed to SVN as r3560.
 2009-09-26 14:50:24 +00:00
Amar Takhar
c7bbf95c9b Add quotes around PROJECT_NAME so the space doesn't get swallowed. 
Originally committed to SVN as r3559.
 2009-09-26 09:40:49 +00:00
Amar Takhar
c98fe933a4 Add @ingroup tags and another doxygen comment. 
Originally committed to SVN as r3558.
 2009-09-26 09:38:17 +00:00
Amar Takhar
16a6616da7 Fix misnaming of a group (s/Unix/unix/) 
Originally committed to SVN as r3557.
 2009-09-26 09:31:08 +00:00
Amar Takhar
6c0e38b868 Fix a whole bunch of doxygen markup errors. Also add missing docs. 
Originally committed to SVN as r3555.
 2009-09-26 09:22:54 +00:00