Commit graph

3496 commits

Author SHA1 Message Date
Thomas Goyne
a2af06f302 Fix a few errors in the default hotkeys
Originally committed to SVN as r5220.
2011-01-16 08:49:53 +00:00
Thomas Goyne
8c8b149236 Fix a few warnings in the reporter
Originally committed to SVN as r5219.
2011-01-16 07:18:06 +00:00
Thomas Goyne
be71a66600 Add command and AudioController support for saving audio clips
Originally committed to SVN as r5218.
2011-01-16 07:18:00 +00:00
Thomas Goyne
403d465475 Fix hotkeys with non-alphanumeric keys other than back, return, escape, space and delete
Originally committed to SVN as r5217.
2011-01-16 07:17:53 +00:00
Thomas Goyne
a1bd974969 Partially convert the subtitles grid's context menu over to using commands
Originally committed to SVN as r5216.
2011-01-16 07:17:46 +00:00
Thomas Goyne
df1dce3593 Kill SubtitlesGrid::ass and SubtitlesGrid::EditBox and convert everything that used them over to agi::Context
Originally committed to SVN as r5215.
2011-01-16 07:17:36 +00:00
Thomas Goyne
778338fa2b Remove FrameMain::menuCreated
Originally committed to SVN as r5214.
2011-01-16 07:17:29 +00:00
Thomas Goyne
6c0db27fac Remove some of FrameMain's friends
Originally committed to SVN as r5213.
2011-01-16 07:17:24 +00:00
Thomas Goyne
362e4c776b Make a large chunk of FrameMain's members private
Originally committed to SVN as r5212.
2011-01-16 07:17:17 +00:00
Thomas Goyne
d84b768171 Remove the 'audio' and 'grid' public members from VideoContext and migrate everything that used them over to Context
Originally committed to SVN as r5211.
2011-01-16 07:17:08 +00:00
Thomas Goyne
169d3cd31c Add the selection controller to the context
Originally committed to SVN as r5210.
2011-01-16 07:17:02 +00:00
Thomas Goyne
8544565c0e Rearrange FrameMain initialization order to seperate context initialization and control creation a bit, and eliminate local pointers to non-view parts of the context
Originally committed to SVN as r5209.
2011-01-16 07:16:54 +00:00
Thomas Goyne
9f25b51a54 Rearrange context.h
Originally committed to SVN as r5208.
2011-01-16 07:16:48 +00:00
Thomas Goyne
7210ea17d8 Add pre-save signal to AssFile and move most of the logic in FrameMain::SaveSubtitles to slots for this signal
Originally committed to SVN as r5207.
2011-01-16 07:16:40 +00:00
Thomas Goyne
59300cbc27 Add a subtitle open signal and move most of the logic in FrameMain::LoadSubtitles to slots for this signal.
Originally committed to SVN as r5206.
2011-01-16 07:16:33 +00:00
Thomas Goyne
314a07c9ab Move post-video-load logic from FrameMain::LoadVideo to FrameMain::OnVideoOpen, and open videos via VideoContext directly
Originally committed to SVN as r5205.
2011-01-16 07:16:27 +00:00
Thomas Goyne
1664faf159 Make SubtitlesGrid listen for changes to "Subtitle/Grid/Hide Overrides" rather than refreshing it from the command
Originally committed to SVN as r5204.
2011-01-16 07:16:21 +00:00
Thomas Goyne
bee57ccad3 Make DialogSpellChecker operate on a context rather than going through FrameMain
Originally committed to SVN as r5203.
2011-01-16 07:16:13 +00:00
Thomas Goyne
1aeded1a29 Make scoped_ptr's constructor explicit
Originally committed to SVN as r5202.
2011-01-16 07:16:07 +00:00
Thomas Goyne
71937757a2 Remove #pragma once from context.h and fix resulting compilation errors
Originally committed to SVN as r5201.
2011-01-16 07:16:00 +00:00
Thomas Goyne
64ebce6c0f Move NextFrame and PrevFrame from VideoSlider to VideoContext
Originally committed to SVN as r5200.
2011-01-16 07:15:53 +00:00
Thomas Goyne
08ec92046f Implement MRU commands
Originally committed to SVN as r5199.
2011-01-16 07:15:46 +00:00
Thomas Goyne
ecea389e62 Add macro for defining command groups (i.e. menus) as they're almost entirely boilerplate
Originally committed to SVN as r5198.
2011-01-16 07:15:40 +00:00
Thomas Goyne
583aed4533 Convert commands to structs to eliminate a line of boilerplate per command
Originally committed to SVN as r5197.
2011-01-16 07:15:32 +00:00
Thomas Goyne
9779eacbf1 Implement almost all stubbed-out commands other than the MRU ones
Originally committed to SVN as r5196.
2011-01-16 07:15:24 +00:00
Thomas Goyne
7afbce439d AppName has to be set before ?user can be used
Originally committed to SVN as r5195.
2011-01-16 07:15:18 +00:00
Thomas Goyne
f604e0bacd Add spacers to the main toolbar
Originally committed to SVN as r5194.
2011-01-16 07:15:11 +00:00
Thomas Goyne
77cb5b75b8 Disable the video details menu item when no video is loaded
Originally committed to SVN as r5193.
2011-01-16 07:15:05 +00:00
Thomas Goyne
685d4841dc Wrap documentation in audio_timing.h at 80 columns
Originally committed to SVN as r5192.
2011-01-16 07:14:59 +00:00
Thomas Goyne
daa8c58cd8 Don't announce marker movements that update the styled ranges as well; it's redundant and the marker move signal is more useful as only non-interactive markers.
Originally committed to SVN as r5191.
2011-01-16 07:14:53 +00:00
Thomas Goyne
cc5952035e Don't declare methods as virtual in a class not intended to be inherited from
Originally committed to SVN as r5190.
2011-01-16 07:14:47 +00:00
Thomas Goyne
84ffb4414a Update vs2008 respack project
Originally committed to SVN as r5189.
2011-01-16 07:14:24 +00:00
Niels Martin Hansen
4c5d8f54ea Forgot svn:keywords...
Originally committed to SVN as r5188.
2011-01-14 07:52:41 +00:00
Niels Martin Hansen
238f2dedb6 Custom property page for the respack tool, how cool!
Also include the standard targets later to make the projects stop spewing build status files into wrong dirs.

Originally committed to SVN as r5187.
2011-01-14 07:40:06 +00:00
Niels Martin Hansen
a7dd3611a2 Here's an MSBuild project file for Aegisub itself!
Originally committed to SVN as r5186.
2011-01-14 03:49:28 +00:00
Niels Martin Hansen
cda28d706b More clean-up of the MSBuild projects. (The IDE hates me for this.)
Originally committed to SVN as r5185.
2011-01-14 03:47:57 +00:00
Niels Martin Hansen
6490faa5c5 Prevent CSRI helper library from causing linking apps (like aegisub.exe) to export symbols.
Originally committed to SVN as r5184.
2011-01-14 02:05:01 +00:00
Niels Martin Hansen
8b58a63bd5 CSRI helper library MSBuild project.
Originally committed to SVN as r5183.
2011-01-14 01:30:17 +00:00
Niels Martin Hansen
1e6ace134a Respack produced invalid resources on Windows since it was opening files in text mode, causing newline conversions to happen.
Having it open files in binary mode instead fixes the problem.

Originally committed to SVN as r5182.
2011-01-14 01:29:47 +00:00
Niels Martin Hansen
59b8686fdc MSBuild project for chardet.
Originally committed to SVN as r5181.
2011-01-14 01:08:47 +00:00
Niels Martin Hansen
73905fb1b5 Add some DirectX detection.
Originally committed to SVN as r5180.
2011-01-11 22:04:47 +00:00
Niels Martin Hansen
87ac25bfa7 Add some missing files to the libaegisub project. Make Lua compile as C++ to get C++ name mangling, as Aegisub expects that.
Originally committed to SVN as r5179.
2011-01-11 22:04:21 +00:00
Amar Takhar
585b108671 Takes exactly 3 arguments it's not a minimum.
Originally committed to SVN as r5178.
2011-01-11 21:50:27 +00:00
Amar Takhar
357adc07dc Add some comments.
Originally committed to SVN as r5177.
2011-01-11 21:47:59 +00:00
Niels Martin Hansen
5d6730919d Fix ResPack target not actually building the intended resource files.
Originally committed to SVN as r5176.
2011-01-11 21:36:13 +00:00
Niels Martin Hansen
f1121898b9 Update ResPack project, write ResPack target for MSBuild and add libresrc project that uses the ResPack target.
The ResPack target is not ideal, it will regenerate the source files even when they are up to date, if only the object files are outdated. This means that in batch builds, the source files will get regenerated for every platform/config built.

Originally committed to SVN as r5175.
2011-01-11 20:25:47 +00:00
Niels Martin Hansen
3974dfd1f2 Reorganise the property sheet includes to use a master include, and use properties to control inclusion of wxWidgets and Freetype, and any further deps.
Originally committed to SVN as r5174.
2011-01-11 18:15:31 +00:00
Amar Takhar
75b732bf60 Use lowercase filenames for OS X includes. HFS is case-insensitive and since I'm cross-compiling the OS X version from Linux it fails when you try to include files using uppercase names when they're actually lowercase.
Originally committed to SVN as r5173.
2011-01-11 17:52:17 +00:00
Niels Martin Hansen
a7954fc3e0 MSBuild project for libaegisub.
Originally committed to SVN as r5172.
2011-01-11 17:50:03 +00:00
Amar Takhar
f576bf912a Add missing headers.
Originally committed to SVN as r5171.
2011-01-11 17:22:44 +00:00
Amar Takhar
a3534f2cae Fix identifers, _misc is no longer used.
Originally committed to SVN as r5169.
2011-01-11 17:00:11 +00:00
Amar Takhar
3ce2b1d802 Fix build to use new method.
Originally committed to SVN as r5168.
2011-01-11 16:59:03 +00:00
Amar Takhar
1a9f9abbed Add respack manifests.
Originally committed to SVN as r5167.
2011-01-11 16:58:47 +00:00
Amar Takhar
29f02c515b Move buttons from 16/* and 24/* to button/*_(16|24).png. This is a closer representation of what they're like in-source and in the future we'll only have 1 version of each icon
Originally committed to SVN as r5166.
2011-01-11 16:57:44 +00:00
Amar Takhar
9d34dfb01c Rewrite respack in pure C++, this is required to make cross-compiling sane.
Originally committed to SVN as r5165.
2011-01-11 16:55:15 +00:00
Amar Takhar
a02fee90c3 Add a quick script used for distfile building. I don't see any reason to support a pure makefile solution and make it unnecessarily complex. In the future if anyone feels they may want to use this build system I'll change it otherwise we'll use this for now.
Originally committed to SVN as r5164.
2011-01-10 21:33:58 +00:00
Amar Takhar
7a8829efdc Remove Makefile.inc from EXTRA_DIST
Originally committed to SVN as r5163.
2011-01-10 21:32:54 +00:00
Amar Takhar
03ca62df22 Include dependency files into the Makefiles. This gives us dep tracking for headers.
Originally committed to SVN as r5162.
2011-01-10 21:27:39 +00:00
Niels Martin Hansen
0d6edabbdc Prettify the property files a bit and add some real sample files for the userconfig dir.
Originally committed to SVN as r5161.
2011-01-10 17:46:15 +00:00
Niels Martin Hansen
5f7fbf48c6 Use project relative paths for source files, to work around this (possible) MSBuild bug:
https://connect.microsoft.com/VisualStudio/feedback/details/635294/using-absolute-path-in-clcompile-item-prevents-property-pages-from-showing

Originally committed to SVN as r5160.
2011-01-10 01:27:12 +00:00
Niels Martin Hansen
231220cc63 Oops, left in an Import that shouldn't be there anyway.
Originally committed to SVN as r5159.
2011-01-09 23:06:01 +00:00
Karl Blomster
a90d855950 update ffms2 to r409
Originally committed to SVN as r5158.
2011-01-09 21:47:46 +00:00
Niels Martin Hansen
a08eb28846 MSBuild projects for the contrib libraries, except CSRI.
There is an odd bug/glitch where it is impossible to view property pages for single source files through the VS 2010 IDE, but compilation works as intended.

Originally committed to SVN as r5157.
2011-01-09 08:01:57 +00:00
Niels Martin Hansen
95c2649721 Add a bunch more property files for MSBuild projects
Originally committed to SVN as r5156.
2011-01-09 07:08:36 +00:00
Amar Takhar
c2a81a5dd7 Add a cast to make x64 build on windows happy.
Originally committed to SVN as r5155.
2011-01-09 02:49:49 +00:00
Amar Takhar
e1a59d307e * Fix iconv LDFLAGS for *bsd*
* Minor style fix for $GL_LIBS test.
 * Fail if iconv isn't found.
 * Fix variable name for the ! subtitle-found case which was over-writing the audio variable.

Originally committed to SVN as r5154.
2011-01-09 01:37:34 +00:00
Amar Takhar
73bd4f2398 * Remove awk check -- we haven't need it in over a year.
* Remove check for iconv.m4, I switched to custom code over a year ago.

Originally committed to SVN as r5153.
2011-01-09 01:36:18 +00:00
Amar Takhar
23d96d071c Add missing property sheets to x64 build config.
Originally committed to SVN as r5152.
2011-01-09 00:47:06 +00:00
Niels Martin Hansen
a13e0ddedf Clear out some warnings emitted by Visual C++ 2010.
On 32 bit VC 2010, std::streamsize is 64 bit while size_t is 32 bit.

Originally committed to SVN as r5151.
2011-01-08 21:58:48 +00:00
Niels Martin Hansen
abf9ee645b std::basic_streambuf::_Sgetn_s was removed was Visual C++ 2010 for some reason.
Originally committed to SVN as r5150.
2011-01-08 21:54:31 +00:00
Karl Blomster
71928bc25b update ffms2 to r407
Originally committed to SVN as r5149.
2011-01-08 20:32:18 +00:00
Amar Takhar
8f401a838a Add utilities to a util:: namespace for clarity.
Originally committed to SVN as r5148.
2011-01-08 19:16:11 +00:00
Amar Takhar
68aa077add Actually add util.(c|h) which should have been in r5146.
Originally committed to SVN as r5147.
2011-01-08 19:14:48 +00:00
Amar Takhar
93f8b84688 * Instantiate log class.
* Create new util file and add a config_path() function to get Aegisubs' configuration directory.
 * Header cleanu

Originally committed to SVN as r5146.
2011-01-08 19:14:02 +00:00
Amar Takhar
3f110101aa Ensure the proper cflags are set for common/charset_conv.cpp in libaegisub. Also fix iconv include path on *bsd.
Originally committed to SVN as r5145.
2011-01-08 17:46:46 +00:00
Amar Takhar
69af40edc6 Fix compilation of linux support in the reporter.
Originally committed to SVN as r5144.
2011-01-08 15:38:30 +00:00
Amar Takhar
55803684c3 Use -Wl for linker flags.
Originally committed to SVN as r5143.
2011-01-08 15:38:11 +00:00
Amar Takhar
4eeacb5ab9 Silence warning.
Originally committed to SVN as r5142.
2011-01-08 15:25:04 +00:00
Amar Takhar
c67fe6db5d Re-add platform-specific headers and fix prototypes.
Originally committed to SVN as r5141.
2011-01-08 15:24:35 +00:00
Amar Takhar
9d5a2b41b5 Add missing headers and sort.
Originally committed to SVN as r5140.
2011-01-08 15:18:58 +00:00
Amar Takhar
ef76d4b91b Remove debug printf.
Originally committed to SVN as r5139.
2011-01-08 15:17:11 +00:00
Amar Takhar
7155e550ad Update for change of paths.
Originally committed to SVN as r5138.
2011-01-08 14:22:23 +00:00
Amar Takhar
1530115458 Add libaegisub to solution.
Originally committed to SVN as r5137.
2011-01-08 14:22:12 +00:00
Amar Takhar
319ac2d4bb Catch all exceptions when deciding whether to load the default config.
Originally committed to SVN as r5136.
2011-01-08 12:13:24 +00:00
Amar Takhar
0d7b2c6e76 Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp.
Originally committed to SVN as r5135.
2011-01-08 12:10:40 +00:00
Amar Takhar
c95d92c2ca Add a temp conditional to avoid exceptions when a command doesn't exist since the hotkeys aren't fully converted.
Originally committed to SVN as r5134.
2011-01-06 15:33:55 +00:00
Thomas Goyne
b56b641122 MSVC hurfs a blurf when two files in the same project have the same name
Originally committed to SVN as r5133.
2011-01-05 18:40:46 +00:00
Thomas Goyne
e450cb3e7e Fix include paths
Originally committed to SVN as r5132.
2011-01-05 18:40:37 +00:00
Thomas Goyne
c6b65d8b82 Remove deleted files from the projects and add the new files
Originally committed to SVN as r5131.
2011-01-05 18:40:30 +00:00
Thomas Goyne
813aab2473 Add default_hotkey.json, default_menu.json, default_path.json, and default_toolbar.json to respack's post-build event.
Originally committed to SVN as r5130.
2011-01-05 18:40:24 +00:00
Amar Takhar
1ac31c65bf Remove medusa commands, they don't technically exist anymore as we call it "global timing mode" now.
Originally committed to SVN as r5129.
2011-01-05 14:19:11 +00:00
Amar Takhar
2804e0cb52 Actually trigger a hotkey if it exists.
Originally committed to SVN as r5128.
2011-01-05 14:07:23 +00:00
Amar Takhar
9915fb1c3b Add a depedency for libresrc on the 'command' subdir to ensure it's built first.
Originally committed to SVN as r5127.
2011-01-05 13:36:13 +00:00
Amar Takhar
167f09a610 Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 13:00:46 +00:00
Amar Takhar
cdc73b17d2 Add support for bitmask options to Options. First one is to avoid flushing the config to disk which we don't want to happen when the reporter uses Options to read config values.
Originally committed to SVN as r5123.
2011-01-04 04:24:40 +00:00
Amar Takhar
010f3c14e5 Fix reading of aegisub config values.
Originally committed to SVN as r5122.
2011-01-04 04:23:51 +00:00
Amar Takhar
a0e760c9da Replace all instances of wxString with std::string where possible.
Originally committed to SVN as r5121.
2011-01-04 00:22:55 +00:00
Amar Takhar
4d3c89eebf Cache wxGL* values to speed up GL probes, also delete locale in ~Platform().
Originally committed to SVN as r5120.
2011-01-03 16:14:43 +00:00
Amar Takhar
99aff7254f * wxString is really annoying.
* Build JSON tree.

Originally committed to SVN as r5119.
2011-01-03 15:46:21 +00:00
Amar Takhar
c041bb8884 * Remove all vestiges of XML.
* Generate the report in the constructor.

Originally committed to SVN as r5118.
2011-01-03 14:28:24 +00:00
Amar Takhar
22c797a5d1 Fix some longstanding bugs now that I understand wxWidgets better.
Originally committed to SVN as r5116.
2011-01-03 14:11:53 +00:00
Amar Takhar
f04d721228 Remove the name map, it's no longer required.
Originally committed to SVN as r5115.
2011-01-03 13:43:39 +00:00
Amar Takhar
7514812a25 Convert rest of the values to JSON.
Originally committed to SVN as r5114.
2011-01-03 13:33:53 +00:00
Amar Takhar
4118580bb6 Add JSON stubs, remove a bunch of now obsolete code.
Originally committed to SVN as r5113.
2011-01-03 13:20:53 +00:00
Amar Takhar
e35badd20a Convert more groups to JSON and simplify source further.
Originally committed to SVN as r5112.
2011-01-03 13:02:16 +00:00
Amar Takhar
5985c60ded First stab at converting the reporter to use JSON and updating it to a saner design.
Originally committed to SVN as r5111.
2011-01-03 12:00:12 +00:00
Amar Takhar
efe88823c7 Add missing header.
Originally committed to SVN as r5091.
2011-01-02 02:37:05 +00:00
Amar Takhar
96a567086c Remove calls to wxPrintf and replace them with LOG_E().
Originally committed to SVN as r5090.
2011-01-02 02:33:24 +00:00
Amar Takhar
64f60e0215 Add missing header, thanks.. closes #1255
Originally committed to SVN as r5089.
2011-01-02 01:44:54 +00:00
Thomas Goyne
d282b425c0 Update the audio display when keyframes are loaded/unloaded
Originally committed to SVN as r5086.
2010-12-31 23:53:42 +00:00
Thomas Goyne
7347c09ac0 Use Bind rather than Connect in AudioController
Originally committed to SVN as r5085.
2010-12-31 23:53:36 +00:00
Thomas Goyne
cf89403a5b Listen for timecode load signals in AudioMarkerProviderKeyframes
Originally committed to SVN as r5084.
2010-12-31 23:53:30 +00:00
Thomas Goyne
4fdad923ad Timecodes and keyframes are always sorted, so fix some code that assumed they could be unsorted
Originally committed to SVN as r5083.
2010-12-31 23:53:23 +00:00
Thomas Goyne
17c07cc131 Add timecodes opened signal to VideoContext
Originally committed to SVN as r5080.
2010-12-31 21:03:18 +00:00
Thomas Goyne
824294078f Move YUV -> RGB conversion to VideoProviderYUV4MPEG and remove support for formats other than RGB32 from AegiVideoFrame
Originally committed to SVN as r5079.
2010-12-31 21:03:11 +00:00
Thomas Goyne
833e69b09f Replace MIN/MAX/MID with std::min/std::max/mid
Originally committed to SVN as r5078.
2010-12-31 21:03:03 +00:00
Thomas Goyne
c6a823c731 Remove duplicate inclusion of several files in the project
Originally committed to SVN as r5077.
2010-12-31 21:02:56 +00:00
Thomas Goyne
5920c3124b Make agi::Signal uncopyable
Originally committed to SVN as r5076.
2010-12-31 21:02:49 +00:00
Thomas Goyne
a566955047 Rename signals.h to signal.h
Originally committed to SVN as r5075.
2010-12-31 21:02:42 +00:00
Thomas Goyne
7c2e4e5115 Add tests for agi::keyframe
Originally committed to SVN as r5074.
2010-12-31 21:02:31 +00:00
Thomas Goyne
edff7d6a2d Rewrite keyframe loading and saving code and move it to libaegisub
Originally committed to SVN as r5073.
2010-12-31 21:02:17 +00:00
Thomas Goyne
ea93f6afba Remove pointless performance hurting call to glFinish
Originally committed to SVN as r5071.
2010-12-30 22:19:42 +00:00
Thomas Goyne
5370f3fa04 Make ThreadedFrameSource never lock jobMutex and fileMutex at the same time. Moderately improves responsiveness of the audio display while video is loaded.
Originally committed to SVN as r5070.
2010-12-30 22:19:36 +00:00
Thomas Goyne
ca8b6d8525 Wrap docs in audio_controller.h at 80 columns rather than 100
Originally committed to SVN as r5069.
2010-12-30 22:19:30 +00:00
Thomas Goyne
f3d1bc23bd Reduce the amount of repainting done when the selection changes to a new one that doesn't overlap the old selection
Originally committed to SVN as r5068.
2010-12-30 22:19:24 +00:00
Thomas Goyne
364f398c5f Kill VideoContext::keyframesRevision, which is no longer used
Originally committed to SVN as r5067.
2010-12-30 22:19:18 +00:00
Thomas Goyne
4684d5c4f8 Only refresh the audio portion of the audio display when markers are moved. Fixes bug where the timeline would sometimes be bold.
Originally committed to SVN as r5066.
2010-12-30 22:19:12 +00:00
Thomas Goyne
a64dc820a4 Remove VideoDisplay's border as on Windows it's rendered on top of the client area, hiding part of the video and throwing off hit detection for the visual tools
Originally committed to SVN as r5061.
2010-12-30 19:13:53 +00:00
Thomas Goyne
5f0ba21e30 Fix bug where the first gl glyph in each row after the first would be overwritten, resulting in the incorrect number being shown in the cross visual tool
Originally committed to SVN as r5060.
2010-12-30 19:13:45 +00:00
Thomas Goyne
73c0515954 Add handling for invalid timecode errors when opening video
Originally committed to SVN as r5059.
2010-12-29 19:35:45 +00:00
Thomas Goyne
bd7ac88f6b Apply container audio delay when the FFMS2 version used supports it. Closes #1251.
Originally committed to SVN as r5058.
2010-12-29 06:27:02 +00:00
Thomas Goyne
ce2adcea79 Revert r4828 as I decided to fix it in FFMS2 instead.
Originally committed to SVN as r5057.
2010-12-29 06:26:56 +00:00
Amar Takhar
ceb2bebf2c Library links should not have absolute paths (from Nikoli on freenode.)
Originally committed to SVN as r5007.
2010-12-14 21:02:20 +00:00
Amar Takhar
45c971da68 Add a note about DESTDIR= support
Originally committed to SVN as r5004.
2010-12-14 18:53:17 +00:00
Amar Takhar
7b7b15f0a1 Include stdint.h for uintptr_t, it's odd that I've never had a problem with this on the several platforms I've built on, which excluded Gentoo of course.
Originally committed to SVN as r5003.
2010-12-14 18:17:49 +00:00
Thomas Goyne
36ded6ef89 Disable events while processing all file change events in SubsEditBox as apparently wxComboBox::Clear triggers change events on some platforms
Originally committed to SVN as r4960.
2010-12-12 00:34:02 +00:00
Thomas Goyne
fc9607cbb1 Disable deprecation warnings in libass on windows
Originally committed to SVN as r4959.
2010-12-12 00:33:55 +00:00
Thomas Goyne
017c09489b Add missing config.h include in ass_drawing.c
Originally committed to SVN as r4958.
2010-12-12 00:33:48 +00:00
Niels Martin Hansen
ba6fded1cd Make sure Windows builds don't get min and max macros defined from WinDef.h.
Originally committed to SVN as r4957.
2010-12-11 18:27:28 +00:00
Niels Martin Hansen
d188673e7c Remove #ifdef block around #include "agi_pre.h", as it causes the VC10 compiler to explode. Hopefully this won't break build somewhere else.
Originally committed to SVN as r4956.
2010-12-11 16:52:12 +00:00
Niels Martin Hansen
60b3ea15c3 Switch _WINDOWS for _WIN32, as _WINDOWS doesn't seem to be defined using MSVC 2010 headers. On the other hand, _WIN32 is always defined by the compiler.
Originally committed to SVN as r4955.
2010-12-11 16:47:03 +00:00
Niels Martin Hansen
d63a646c2a Small beginnings of MSBuild-based build system, for Visual Studio 2010/Windows 7.1 SDK.
So far proof of concept building just the respack program, using a semi-generalised form of finding wxWidgets. For it to find wxWidgets, a user configuration needs to be placed in the userconfig dir, see readme.txt.

Originally committed to SVN as r4954.
2010-12-11 16:35:22 +00:00
Amar Takhar
a2513f03a7 Add a check for tools/osx-bundle.sed, if it doesn't exist it will create 0 byte files, strange things can happen.
Originally committed to SVN as r4953.
2010-12-11 01:32:59 +00:00
Amar Takhar
572e27f681 Add LDFLAGS to the link line for shared libraries, this fixes the build on OSX. (and should have been there anyway)
Originally committed to SVN as r4952.
2010-12-11 01:32:24 +00:00
Amar Takhar
52497737cd Fixup osx-bundle.sh:
* Remove libtool hack
 * Fix locale installation now that intltool is gone.
 * Some pretty-print cleanups.

Originally committed to SVN as r4951.
2010-12-10 23:05:05 +00:00
Amar Takhar
063cd0480d OS X also needs typename to be defined within the template, that makes Windows,BSD and OS X, it's better to exclude platforms when we hit them.
Originally committed to SVN as r4920.
2010-12-08 18:58:10 +00:00
Amar Takhar
944eaa535e Remove universalchardet headers from the precompiled header. For some reason this was causing issues with compliation on FreeBSD, rather than investigate why I removed it since it's used by exactly 1 file (charset_ucd.cpp). If it's going to cause one problem now it may cause another later that we may not notice.
Originally committed to SVN as r4919.
2010-12-08 14:32:30 +00:00
Amar Takhar
b0eb1dfe7c Add missing source files to Makefile.
Originally committed to SVN as r4918.
2010-12-08 14:31:24 +00:00
Amar Takhar
5d73bcc598 Remove common/option_value.cpp it was converted to use signals in r4899.
Originally committed to SVN as r4917.
2010-12-08 14:21:45 +00:00
Amar Takhar
32bb692521 Define typename in the Signal template for FreeBSD as well. I'm not sure why this is required (yet) but we may need it on other platforms as well.
Originally committed to SVN as r4916.
2010-12-08 14:20:53 +00:00
Amar Takhar
819a298246 Add -Wno-variadic-macros to silence "warning: anonymous variadic macros were introduced in C99" with GCC.
Originally committed to SVN as r4915.
2010-12-08 13:35:33 +00:00
Thomas Goyne
a6a4132ab5 Make the audio timing controller commit changes made
Originally committed to SVN as r4914.
2010-12-08 08:10:00 +00:00
Thomas Goyne
e1e98d0ddd Only refresh the time columns of the subtitle grid when times change
Originally committed to SVN as r4913.
2010-12-08 08:09:55 +00:00
Thomas Goyne
27cb511556 Make blank audio actually blank
Originally committed to SVN as r4912.
2010-12-08 08:09:49 +00:00
Thomas Goyne
a6236fa20c Only work around wxMac bugs on wxMac
Originally committed to SVN as r4911.
2010-12-08 08:09:44 +00:00
Thomas Goyne
30cd87bcb3 When zooming, fix the center sample in place
Originally committed to SVN as r4910.
2010-12-08 08:09:37 +00:00
Thomas Goyne
82eddf53ea Remove redundant checks in SampleRange::overlaps
Originally committed to SVN as r4909.
2010-12-08 08:09:30 +00:00
Thomas Goyne
b134428668 Store the URL of opened audio files
Originally committed to SVN as r4908.
2010-12-08 08:09:25 +00:00
Thomas Goyne
3345797ff6 Use signals in AudioController and AudioTimingController
Originally committed to SVN as r4907.
2010-12-08 08:09:16 +00:00
Thomas Goyne
3bb1f590d7 Sabotage the once lovely friendship between FrameMain and AudioBox and use an option listener instead
Originally committed to SVN as r4906.
2010-12-08 08:09:11 +00:00
Thomas Goyne
5f39b99b78 Make AudioDisplay use scoped_ptr for pointers it owns
Originally committed to SVN as r4905.
2010-12-08 08:09:05 +00:00
Thomas Goyne
7f076bbbc9 Fix crash on exit
Originally committed to SVN as r4904.
2010-12-08 08:09:00 +00:00
Amar Takhar
c15777f844 Merge audio_display_rewrite branch to trunk. This is not a complete work, don't expect to time anything for a while.
Originally committed to SVN as r4903.
2010-12-08 03:36:10 +00:00
Thomas Goyne
0e6d8631fd Add scoped_ptr.h
Originally committed to SVN as r4902.
2010-12-07 19:09:37 +00:00
Thomas Goyne
6d2b941e76 Rework how committing changes works
Rather than everything having to separately commit changes to the ass
and then tell the subs grid to notify various parts of Aegisub about the
changes, committing the AssFile now triggers an event which objects
listen for.

AssFile::Commit now also has an argument to indicate what sorts of
changes were made to the file. For now these types are very broad.

Originally committed to SVN as r4901.
2010-12-07 19:09:28 +00:00
Thomas Goyne
d9006b0eb4 Make VideoContext use events for some of its communication with other objects
Originally committed to SVN as r4900.
2010-12-07 19:09:21 +00:00
Thomas Goyne
13f052317e Convert OptionValue over to agi::signal
Originally committed to SVN as r4899.
2010-12-07 19:09:15 +00:00
Thomas Goyne
4fc1ff6ad6 Add simple signal/slot implementation loosly based on boost.sigal
Originally committed to SVN as r4898.
2010-12-07 19:09:08 +00:00
Amar Takhar
31e2828517 Add -D__STDC_FORMAT_MACROS to ffmpegsource_common.o, this should have been in r4896, comitted from the wrong machine...
Originally committed to SVN as r4897.
2010-12-05 23:26:28 +00:00
Amar Takhar
09274c4a1b Remove -D__STDC_FORMAT_MACROS from CXXFLAGS.
Originally committed to SVN as r4896.
2010-12-05 23:08:11 +00:00
Amar Takhar
5a635ebdb3 Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage.
Originally committed to SVN as r4895.
2010-12-05 19:12:42 +00:00
Amar Takhar
d6e9ee9487 Add <memory> for auto_ptr
Originally committed to SVN as r4854.
2010-11-29 10:17:12 +00:00
Thomas Goyne
12bf2a595d Disable analysis on build for libaegisub as it results in versions of Visual Studio that do not support /analyze rebuilding the entire project every time.
Originally committed to SVN as r4852.
2010-11-21 05:14:11 +00:00
Thomas Goyne
d840c9eaae Put libaegisub win32/debug intermediate files in the standard location
Originally committed to SVN as r4851.
2010-11-21 05:13:57 +00:00
Amar Takhar
b68fc9b68b Add a stub config.h to satisfy matroskaparser.c.
Originally committed to SVN as r4850.
2010-11-20 05:22:00 +00:00
Thomas Goyne
3d85cacae0 Apply the export transform when sending subtitles to the provider on the video worker thread rather than the GUI thread
Originally committed to SVN as r4849.
2010-11-18 06:15:41 +00:00
Thomas Goyne
c571f64f86 Fix compilation error on unix when using internal libass
Originally committed to SVN as r4848.
2010-11-18 04:31:38 +00:00
Thomas Goyne
ea5a042046 Cache the list of dictionary languages
Originally committed to SVN as r4847.
2010-11-18 03:00:08 +00:00
Thomas Goyne
75285192a3 Add overloaded operator-> to agi::line_iterator
Originally committed to SVN as r4846.
2010-11-17 05:44:02 +00:00
Thomas Goyne
1bb8d16a45 Rewrite HunspellSpellChecker
Add support for loading dictionaries from both the user's dictionary
path and the application's install path

Fix some issues with loading and saving the user's customized dictionary

Originally committed to SVN as r4845.
2010-11-17 05:43:56 +00:00
Thomas Goyne
1214290e90 Change default path to dictionaries to ?user/dictionaries (from ?user/dictionary) to match 2.1.x
Originally committed to SVN as r4844.
2010-11-17 05:43:48 +00:00
Thomas Goyne
1b8b53c14e Pass a double pointer rather than a reference to a pointer to wait_for_cache_thread. Fixes endless 'caching' of fonts on linux.
Originally committed to SVN as r4843.
2010-11-11 05:29:13 +00:00
Thomas Goyne
1f894561c3 Actually set options' default values
Originally committed to SVN as r4842.
2010-11-11 04:48:37 +00:00
Thomas Goyne
7a38c1c06e Add some bounds checking in the preferences dialog
Originally committed to SVN as r4841.
2010-11-11 04:48:29 +00:00
Thomas Goyne
6a186d0bcb Add vcproj for libass and fix msvc compilation errors
Originally committed to SVN as r4840.
2010-11-11 04:48:20 +00:00
Thomas Goyne
5be8ee5c0e Update libass to d8a0fe5984d9bc6d7827026215d21ada3dda7b71 and update LICENSE to reflect that libass is now ISCL
Originally committed to SVN as r4839.
2010-11-11 04:48:08 +00:00
Thomas Goyne
c0c82505c7 Fix compilation when no subtitle providers are enabled
Originally committed to SVN as r4838.
2010-11-10 03:35:07 +00:00
Thomas Goyne
598624772d Quote targetpath in respack's build event so it works when the path to the aegisub checkout has spaces in it
Originally committed to SVN as r4837.
2010-11-10 03:34:59 +00:00
Karl Blomster
d134eda2e8 compilation fix
Originally committed to SVN as r4836.
2010-11-09 21:22:58 +00:00
Karl Blomster
d6dde4ec73 update ffms2 to r354
Originally committed to SVN as r4835.
2010-11-09 19:55:23 +00:00
Thomas Goyne
6affce0581 Make OPT_GET return a const OptionValue* and add OPT_SUB/OPT_UNSUB for subscribing to option changes
Originally committed to SVN as r4834.
2010-11-08 05:08:24 +00:00
Thomas Goyne
469bd3e165 Fix bug where the grid headers sometimes used the collision text color
Originally committed to SVN as r4833.
2010-11-08 02:52:54 +00:00
Thomas Goyne
e738847eb2 Update the edit box after splitting a line
Originally committed to SVN as r4832.
2010-11-08 02:28:32 +00:00
Karl Blomster
f34d37d091 remove assorted forgotten traces of the splash screen
Originally committed to SVN as r4831.
2010-11-07 19:32:40 +00:00
Karl Blomster
26b9985d3d Use Tahoma 8pt as default grid font. This is what got used in earlier versions.
Originally committed to SVN as r4830.
2010-11-06 19:51:36 +00:00
Karl Blomster
65b5907a4c Get rid of the splash screen. If you want it back, you better make it a) not broken, and b) actually useful as a startup diagnostics tool. If you can't do both, get out.
Originally committed to SVN as r4829.
2010-11-06 19:44:21 +00:00
Thomas Goyne
50f8389615 Add support for delay in FFmpegSourceAudioProvider as FFMS2 only handles it automatically in the avisynth plugin
Originally committed to SVN as r4828.
2010-11-04 04:58:27 +00:00
Thomas Goyne
a73091ef5c Coalesce visual tool changes
Originally committed to SVN as r4827.
2010-11-01 04:36:13 +00:00
Thomas Goyne
516b2cec93 Only let AssTime be set to a valid time rather than handling invalid times on display
Originally committed to SVN as r4826.
2010-10-27 21:17:41 +00:00
Thomas Goyne
6432ea1f94 Remove the realtime visual tool option, as the threaded video display makes it pointless
Originally committed to SVN as r4825.
2010-10-26 04:12:10 +00:00
Thomas Goyne
3174f995fa Prioritize the fontconfig font lister over the freetype one when both freetype and fontconfig are available
Originally committed to SVN as r4824.
2010-10-22 18:25:02 +00:00
Thomas Goyne
4af788be1a Fix font collector crash
Originally committed to SVN as r4823.
2010-10-20 01:56:28 +00:00
Thomas Goyne
7189dfb1a1 Make the choice between the freetype and fontconfig listers entirely based on the defined setttings rather than platform
Originally committed to SVN as r4822.
2010-10-20 01:56:22 +00:00
Thomas Goyne
da7f1ef96c Make defining WITH_FONTCONFIG on windows actually do something
Originally committed to SVN as r4821.
2010-10-20 00:41:48 +00:00
Thomas Goyne
36a102e558 Improve error reporting when an error occurs during startup
Originally committed to SVN as r4820.
2010-10-20 00:28:37 +00:00
Thomas Goyne
c6f20504cb Fix memory leak in libass provider
Originally committed to SVN as r4819.
2010-10-20 00:28:28 +00:00
Thomas Goyne
49a57729ef Always load initialize fontconfig on a worker thread so that installing a font then opening a new video does not block the GUI thread
Originally committed to SVN as r4818.
2010-10-17 02:36:28 +00:00
Thomas Goyne
7ce2e8f389 Update the \move/pos toggle button's icon when it's clicked
Originally committed to SVN as r4817.
2010-10-16 20:23:54 +00:00
Thomas Goyne
a278901e13 Update the time relative to frame box when the subtitle file is changed to reflect timing changes immediately
Originally committed to SVN as r4816.
2010-10-16 20:11:53 +00:00
Thomas Goyne
9083776b9c Update the color spectrum view when a recently used color is selected in the color picker
Originally committed to SVN as r4815.
2010-10-16 20:11:48 +00:00
Thomas Goyne
3c02917e20 Fix flipped video when switching between avs and ffms2 providers
Originally committed to SVN as r4814.
2010-10-16 20:11:43 +00:00
Thomas Goyne
f7f7699aed Save the video's timecodes if external timecodes aren't loaded
Originally committed to SVN as r4813.
2010-10-16 20:11:37 +00:00
Thomas Goyne
67df3608be Fix crashes when opening a file with zero valid lines
Originally committed to SVN as r4812.
2010-10-16 20:11:32 +00:00
Thomas Goyne
97089a7683 Don't destroy the progress dialog when audio loading is cancelled as it's destroyed automatically
Originally committed to SVN as r4811.
2010-10-16 20:11:26 +00:00
Thomas Goyne
420f28adf8 If the user changes the active row in the middle of searching, search from the new active row even if it's after the last found row. Closes #1004
Originally committed to SVN as r4810.
2010-10-15 16:58:50 +00:00
Karl Blomster
49cdd10ffd fix a bug in kara-templater.lua on behalf of jfs.
Originally committed to SVN as r4808.
2010-10-15 14:33:10 +00:00
Thomas Goyne
f4577a8b3a Don't format libass messages which won't be logged
Originally committed to SVN as r4807.
2010-10-11 20:48:29 +00:00
Thomas Goyne
ef7abaf1b6 Add new dialogue lines immediately after the last dialogue line in the file rather than at the end of the file
Originally committed to SVN as r4806.
2010-10-11 20:06:31 +00:00
Thomas Goyne
aee6b0a540 Make AssAttachment::GetEntryData const so that it's actually called
Originally committed to SVN as r4805.
2010-10-11 20:06:26 +00:00
Thomas Goyne
a41aeb8421 Fix minor layout issues in the dummy video dialog
Originally committed to SVN as r4804.
2010-10-11 20:06:20 +00:00
Thomas Goyne
84f646b88b Fix bug where changing the script resolution would not update the current visual tool
Originally committed to SVN as r4803.
2010-10-11 20:06:15 +00:00
Thomas Goyne
2324a1f197 Add a blank line between each group when writing ass files
Originally committed to SVN as r4802.
2010-10-11 20:06:09 +00:00
Thomas Goyne
7d2c7c5881 Don't add garbage AssEntries for blank lines in the file. Fixes some issues with sorting lines.
Originally committed to SVN as r4801.
2010-10-11 20:06:04 +00:00
Thomas Goyne
fcba0c8e2a Update grid column widths after opening a new subtitle file.
Originally committed to SVN as r4800.
2010-10-11 20:05:59 +00:00
Thomas Goyne
dade679145 Select new styles in the styles manager when they are created.
Originally committed to SVN as r4799.
2010-10-11 20:05:52 +00:00
Thomas Goyne
ed9968e172 Don't pointlessly batch single selection changes when find/replacing. Fixes bug where find would select the wrong part of the line.
Originally committed to SVN as r4798.
2010-10-11 20:05:46 +00:00
Thomas Goyne
b4739d2aee gcc 4.5 compilation fixes
Originally committed to SVN as r4797.
2010-10-11 04:25:02 +00:00
Thomas Goyne
1fbe7b4f1e Increase the size of the buffer used for formatting messages from libass as they can occasionally be longer than 256 characters
Originally committed to SVN as r4796.
2010-10-08 06:06:50 +00:00
Thomas Goyne
82ca2a4b70 Fix issues with the edit box buttons and omitted tag parameters
Originally committed to SVN as r4795.
2010-10-08 06:06:44 +00:00
Thomas Goyne
8545446baa Make select all not take quadratic time
Originally committed to SVN as r4794.
2010-10-08 06:06:38 +00:00
Thomas Goyne
4bf3b44cc0 Add missing swap in ThreadedFrameSource::ProcFrame that resulted in the full subtitle file never being loaded
Originally committed to SVN as r4793.
2010-10-08 06:06:32 +00:00
Thomas Goyne
682fd9406c Check for both forward and back slashes in the windows version of util::DirName
Originally committed to SVN as r4792.
2010-10-07 17:18:00 +00:00
Thomas Goyne
1dedfb18cd Shift timecodes so that frame 0 always starts at time 0, as nothing related to audio supports non-zero start times
Originally committed to SVN as r4791.
2010-09-23 03:06:22 +00:00
Thomas Goyne
7586f28ffe Fix overflow handling in AssTime::GetAssFormatted
Originally committed to SVN as r4790.
2010-09-23 03:06:15 +00:00
Thomas Goyne
35b9769092 Pass around shared_ptrs to newly allocated AegiVideoFrames rather than pointers into a buffer of AegiVideoFrames in ThreadedFrameSource
Originally committed to SVN as r4789.
2010-09-15 22:10:48 +00:00
Thomas Goyne
dca2bd43fe Rearrange ThreadedFrameSource::Entry to allow the use of wxMutexLocker
Originally committed to SVN as r4788.
2010-09-15 22:10:42 +00:00
Amar Takhar
d3fca38ee7 Disable installing the assert handler until I find time to figure out how I can call the default handler which provides the popup / some handy debug tools.
Originally committed to SVN as r4787.
2010-09-15 05:19:01 +00:00
Thomas Goyne
fd5c1ecffc Fix writing of newlines on windows in charsets wider than one byte
Originally committed to SVN as r4786.
2010-09-15 05:00:12 +00:00
Thomas Goyne
84b8877d1d Clean up AssFile::Load, eliminating some redundant checks, and fixing a few situations where the undo stack could be left in an inconsistant state
Originally committed to SVN as r4785.
2010-09-15 02:46:19 +00:00
Karl Blomster
9108ea9b00 Don't try to coalesce undo operations when there aren't any undo operations to coalesce with. Fixes a crash when opening .txt files.
Originally committed to SVN as r4784.
2010-09-15 01:00:18 +00:00
Karl Blomster
0c2b40dc60 Revert r4782 since it wasn't needed if you do the project file right.
Originally committed to SVN as r4783.
2010-09-15 00:18:21 +00:00
Karl Blomster
3bdba76549 I have no idea what kind of enterprising faggot broke this but apparently we need __STDC_FORMAT_MACROS now. I hope this breaks on some other platform, that would be hilarious.
Originally committed to SVN as r4782.
2010-09-15 00:01:59 +00:00
Karl Blomster
035694c9ae I came, I saw, I hurfed a durf about macro redefinitions
Originally committed to SVN as r4781.
2010-09-14 23:53:22 +00:00
Amar Takhar
6f63041156 Redirect assertions to the logging system. This doesn't create a popup dialogue like the default method does. If someone actually wants that to happen let me know and I'll write something.
Originally committed to SVN as r4780.
2010-09-14 22:05:19 +00:00
Amar Takhar
01e1a34d43 Make setup.sh a little more robust when resetting the data/ directory.
Originally committed to SVN as r4779.
2010-09-11 17:48:54 +00:00
Thomas Goyne
c33c5f647d Fix crash when iconv Roundtrip test fails
Originally committed to SVN as r4778.
2010-09-10 03:31:20 +00:00
Thomas Goyne
98305250df Fix compilation of tests on OS X
Originally committed to SVN as r4777.
2010-09-10 03:31:13 +00:00
Thomas Goyne
3512c4e1fe Clean up handling of fallbacks and improve behavior somewhat with glibc iconv
Originally committed to SVN as r4776.
2010-09-09 06:47:50 +00:00
Thomas Goyne
9780243586 Add NOMINMAX to the libaegisub project
Originally committed to SVN as r4775.
2010-09-09 06:47:45 +00:00
Thomas Goyne
81709164b3 Make the detection of BOM sizes actually work
Originally committed to SVN as r4774.
2010-09-09 06:47:29 +00:00
Thomas Goyne
6f7daef630 Bump version number to 3.0 in tests/Makefile.am
Originally committed to SVN as r4773.
2010-09-09 04:05:20 +00:00
Thomas Goyne
ac2bac6d00 Use agi::io::Save in TextFileWriter
Originally committed to SVN as r4772.
2010-09-08 20:03:48 +00:00
Thomas Goyne
2662a69b2e Only autosave if there are unsaved changes to the file
Originally committed to SVN as r4771.
2010-09-08 20:03:20 +00:00
Thomas Goyne
7e72a9e0cf Add background fontconfig cache updating
When the libass provider is enabled, initialize fontconfig on program
startup rather than waiting for the user to open a video. If the user
tries to open a video while the cache is still being updated, display a
"progress" dialog,

Updates #1115.

Originally committed to SVN as r4768.
2010-09-01 06:50:35 +00:00
Thomas Goyne
f77f908611 Fix compilation without precompiled headers. Closes #1241
Originally committed to SVN as r4767.
2010-08-28 02:00:43 +00:00
Thomas Goyne
f37e1bf87a Fix thread warnings on shutdown on unix
Originally committed to SVN as r4766.
2010-08-27 01:01:35 +00:00
Thomas Goyne
071ada7487 Add listener for the autosave timer
Originally committed to SVN as r4765.
2010-08-26 18:38:44 +00:00
Thomas Goyne
0248e7c754 Add listeners for most non-audio options that need them. Closes #1047.
Originally committed to SVN as r4764.
2010-08-26 18:38:37 +00:00
Thomas Goyne
0704887ad4 Save the last viewed page of the preferences dialog
Originally committed to SVN as r4763.
2010-08-26 18:38:31 +00:00
Thomas Goyne
daa77301eb Remove "Colour/Background/Modified" option, which was made irrelevant by r4699.
Originally committed to SVN as r4762.
2010-08-26 18:38:26 +00:00
Thomas Goyne
069581b9be Make the preferences dialog actually update the configuration
Originally committed to SVN as r4761.
2010-08-26 18:38:20 +00:00
Thomas Goyne
5721003219 Split colors into two columns so that the preferences dialog is less awkwardly shaped
Originally committed to SVN as r4760.
2010-08-26 18:38:14 +00:00
Thomas Goyne
5d5f24cbd8 Remove Tip of the Day setting from default_config.json
Originally committed to SVN as r4759.
2010-08-26 18:38:09 +00:00
Thomas Goyne
f15dd92fb1 Change App/Auto/Check For Updates to a bool so that the correct control is used in the preferences dialog
Originally committed to SVN as r4758.
2010-08-26 18:38:03 +00:00
Thomas Goyne
27a7c41a44 Fix option name for auto-updates checkbox
Originally committed to SVN as r4757.
2010-08-26 18:37:46 +00:00
Thomas Goyne
80af629325 Remove dangling reference to boost files in the makefile
Originally committed to SVN as r4756.
2010-08-26 18:03:00 +00:00
Thomas Goyne
06f0c231b0 Make the advanced video options page a child of the advanced options
Originally committed to SVN as r4755.
2010-08-25 19:31:38 +00:00
Thomas Goyne
34c571b81b Change the one use of boost::shared_ptr to std::tr1::shared_ptr and remove the local copy of boost::shared_ptr
Originally committed to SVN as r4754.
2010-08-25 19:31:31 +00:00
Thomas Goyne
574236875c Fix assertion failure in 32-bit builds
Originally committed to SVN as r4753.
2010-08-25 19:31:26 +00:00
Thomas Goyne
a6abc79b95 Add inttypes.h to the precompiled header
Originally committed to SVN as r4752.
2010-08-25 19:31:20 +00:00
Thomas Goyne
459b9e317d Display an error when the config file is corrupted rather than just crashing
Originally committed to SVN as r4751.
2010-08-25 19:31:11 +00:00
Amar Takhar
e6b41058d8 Remove duplicate inclusion of <libaegisub/log.h>.
Originally committed to SVN as r4750.
2010-08-22 21:22:49 +00:00
Amar Takhar
6742a17649 Add a workaround for [Hotkeys] header detection, all this code will go away when the Hotkeys are redone.
Originally committed to SVN as r4749.
2010-08-17 04:44:18 +00:00
Thomas Goyne
d83c59819f Fix deadlock on pthreads-using platforms
Originally committed to SVN as r4748.
2010-08-16 03:06:28 +00:00
Amar Takhar
714fa65071 Rename 2.2 to 3.0 as this will now be the next version outside of 2.1.
Originally committed to SVN as r4747.
2010-08-15 18:40:58 +00:00
Amar Takhar
b50255bfe9 Re-add code removed in r4745 and conditionalise it under BUILD_DARWIN.
Originally committed to SVN as r4746.
2010-08-15 16:55:52 +00:00
Amar Takhar
2bcaf14892 Remove some test code added when fixing the OSX build that slipped into r4743.
Originally committed to SVN as r4745.
2010-08-14 18:57:29 +00:00
Amar Takhar
3c5d4bc97e Relicense libosxutil code (osx/util.cpp and include/util_osx.h) using the same license as the rest of the library. (obsd/2-clause bsdl) Done with the permission of current copyright holder jfs (Niels Martin Hansen).
Originally committed to SVN as r4744.
2010-08-14 18:45:41 +00:00
Amar Takhar
d4ba1f48ca Remove libosxutil and fold it into libaegisub.
Originally committed to SVN as r4743.
2010-08-14 17:42:37 +00:00
Amar Takhar
0d12775f4b osx-bundle target fixes.
Originally committed to SVN as r4742.
2010-08-14 17:38:37 +00:00
Thomas Goyne
b9f9b0a80a Fix potential divide-by-zero with wxGTK when opening video.
Originally committed to SVN as r4741.
2010-08-13 05:51:31 +00:00
Thomas Goyne
9c93198c3b Honor the user's default zoom when possible rather than always overriding it based on the size of the window
Originally committed to SVN as r4740.
2010-08-13 05:51:26 +00:00
Thomas Goyne
768f74ae3c Make VideoDisplay set its initial zoom itself rather than FrameMain
Originally committed to SVN as r4739.
2010-08-13 05:51:17 +00:00
Amar Takhar
6bb5dd0bfd Use OSXSetModified() from wx instead of using Carbon directly.
Originally committed to SVN as r4738.
2010-08-13 00:33:54 +00:00
Amar Takhar
61656d633b * Make GL_EXT() a noop on OS X, it's not required.
* Conditionalise glMultiDrawArraysFallback since it's not used on OS X.
 * Stub APIENTRY at the top of visual_tool_vector_clip.cpp, this should never be added to a header but at the top of source files.

Originally committed to SVN as r4737.
2010-08-13 00:24:35 +00:00
Amar Takhar
ce28cca7c6 Include missing header.
Originally committed to SVN as r4736.
2010-08-12 14:36:09 +00:00
Amar Takhar
9f1b1f1cad Use std::string on osx/unix as well as osx doesn't have strndup.
Originally committed to SVN as r4735.
2010-08-12 14:34:54 +00:00
Amar Takhar
0b4092b602 Fix compilation on Unix/OSX (fix from Plork)
Originally committed to SVN as r4734.
2010-08-12 10:13:29 +00:00
Amar Takhar
cbbb917dce Use $INTLTOOLIZE instead of intltoolize in autogen.sh to ensure the binary, if specified is actually called. I'm amazed noone has noticed this before.
Originally committed to SVN as r4733.
2010-08-12 09:23:19 +00:00
Thomas Goyne
58ca596359 Define NOMINMAX on Windows and remove workarounds for problems caused by those macros.
Originally committed to SVN as r4732.
2010-08-12 06:39:49 +00:00
Thomas Goyne
a400800b54 Remove the override for fonts.conf location on Windows as the default is close enough to sensible.
Originally committed to SVN as r4731.
2010-08-12 01:12:00 +00:00
Thomas Goyne
c8851828cd Get the libass provider working on Windows. Requires a valid fontconfig config file (currently not included).
Originally committed to SVN as r4730.
2010-08-10 05:50:14 +00:00
Thomas Goyne
e7eba4c00d Add Select All and Select None buttons to the import style from script dialog.
Originally committed to SVN as r4729.
2010-08-10 01:47:29 +00:00
Thomas Goyne
87fac1c571 Reduce flickering when changing zoom level.
Originally committed to SVN as r4728.
2010-08-03 20:21:25 +00:00
Thomas Goyne
d5cbb534f8 Make VideoDisplay's size calculations slightly less convoluted.
Originally committed to SVN as r4727.
2010-08-03 20:21:19 +00:00
Thomas Goyne
11d67ec6ae Fix updating of the scroll bar after opening a new file.
Originally committed to SVN as r4726.
2010-08-03 20:21:13 +00:00
Thomas Goyne
f66ef36f93 Change criteria for when opened files should be backed up; rather than not backing up binary files (which aren't detected correctly anymore and always was sort of kludgy), don't back up files which are not in a format we can't write.
Originally committed to SVN as r4725.
2010-08-03 20:21:04 +00:00
Thomas Goyne
3f954dadcc Merge OS X color picker fixes in r3996 and r3997 from 2.1.8. Closes #1114.
Originally committed to SVN as r4724.
2010-08-03 02:16:26 +00:00
Thomas Goyne
2a51ad837e Fix non-precompiled header compilation
Originally committed to SVN as r4723.
2010-08-02 22:14:11 +00:00
Thomas Goyne
46be23073e Fix a few gcc warnings
Originally committed to SVN as r4722.
2010-08-02 20:25:29 +00:00
Thomas Goyne
ce97d995b4 Also remove timecodes and keyframes from the MRU lists when they cannot be found. Updates #717.
Originally committed to SVN as r4721.
2010-08-02 08:18:53 +00:00
Thomas Goyne
596ad4d65d Add missing throw statement
Originally committed to SVN as r4720.
2010-08-02 08:18:45 +00:00
Thomas Goyne
caf81157f1 Fix portaudio player compilation
Originally committed to SVN as r4719.
2010-08-02 08:03:58 +00:00
Thomas Goyne
ff85906cdc Fix compilation errors
Originally committed to SVN as r4718.
2010-08-02 07:21:02 +00:00
Thomas Goyne
c10e9e3a5b Make video and audio providers throw typed exceptions.
Don't display error messages and try other providers when the user
cancels loading a file.

Remove files from the MRU lists if they can't be found.

Closes #717.

Originally committed to SVN as r4717.
2010-08-02 06:32:01 +00:00
Thomas Goyne
71fb04cd29 Rework most of the various factories to not need an explicit helper class for each class constructable via a factory.
Originally committed to SVN as r4716.
2010-08-02 06:31:38 +00:00
Thomas Goyne
f0aa85dfbb Delete the quicktime provider, as it's unmaintained and doesn't work
Originally committed to SVN as r4715.
2010-07-27 03:52:40 +00:00
Thomas Goyne
6407e36c87 Store inner exceptions with shared_ptr rather than a bare pointer so that the inner exception survives copies
Originally committed to SVN as r4714.
2010-07-27 03:52:32 +00:00
Amar Takhar
e2d9241efd No need to disable as this is done when it's deleted anyway.
Originally committed to SVN as r4713.
2010-07-25 17:34:17 +00:00
Amar Takhar
d3077c3b8b Change emit_stdout to a private member variable, this was changed in r4575. Putting it on the stack won't work since it'll just unsubscribe which we don't want. Unfortunatly this is wrapped with _DEBUG everywhere in main.(h|cpp) if we need more debugging code in the future I'll figure out a better solution.
Originally committed to SVN as r4712.
2010-07-25 17:33:44 +00:00
Amar Takhar
79a67ae1ec Add some log messages when subscribing/unsubscribing emitters.
Originally committed to SVN as r4711.
2010-07-25 17:30:12 +00:00
Thomas Goyne
3bdf0f95c6 Remove audio_provider_stream.cpp from the makefile
Originally committed to SVN as r4710.
2010-07-25 05:42:36 +00:00
Thomas Goyne
d4a4db0388 Kill scrubbing code and audio_provider_stream; they were last touched four years ago and never did work.
Originally committed to SVN as r4709.
2010-07-25 03:11:00 +00:00
Thomas Goyne
6040334278 Kill DEBUG_AVISYNTH_CODE as it hasn't actually worked for 3.5 years.
Originally committed to SVN as r4708.
2010-07-23 20:34:23 +00:00
Thomas Goyne
428fc78623 Kill dangling references to dialog_tip.h
Originally committed to SVN as r4707.
2010-07-23 07:00:35 +00:00
Thomas Goyne
d8021262df Enable "Make times continous" when only one line is selected. Closes #822.
Originally committed to SVN as r4706.
2010-07-23 06:40:22 +00:00
Thomas Goyne
35e33bd036 Fix crash when video loading fails.
Originally committed to SVN as r4705.
2010-07-23 06:40:12 +00:00
Thomas Goyne
da0fb8cde7 Fix gcc build errors introduced in r4702
Originally committed to SVN as r4704.
2010-07-23 06:21:22 +00:00
Thomas Goyne
de1588cd1d Delete old tip of the day code. Closes #967.
Originally committed to SVN as r4703.
2010-07-23 06:16:00 +00:00
Thomas Goyne
397b234fba Move video decoding and subtitle rendering to a worker thread
Makes the click event handler for the grid no longer slow when video
autoscroll is enabled, making it harder to accidently select multiple
lines.

Makes seeking speed no longer limited by decoding/rendering speed;
seeking faster than video can be decoded simply results in dropped
frames.

Makes editing the file while a slow-rendering frame is visible far more
responsive.

Originally committed to SVN as r4702.
2010-07-23 05:58:39 +00:00
Thomas Goyne
926b6152f1 Fix detached video crashes.
Originally committed to SVN as r4701.
2010-07-23 04:15:36 +00:00
Thomas Goyne
242b1ee47b Remove deleted files from the makefile
Originally committed to SVN as r4700.
2010-07-20 03:28:50 +00:00
Thomas Goyne
fde4a7815d Make the subtitle edit box auto-commit all changes
This happens to fix most of the undo issues, as it's now much harder to
have uncommitted changes to the file.

Closes #355 and #586.

Originally committed to SVN as r4699.
2010-07-20 03:11:11 +00:00
Amar Takhar
51a75cd0fd Split the preferences to make managing the base code from the actual options. I should have done this yesterday however I completely underestimated how annoying it would be having it all in the same file.
Originally committed to SVN as r4698.
2010-07-19 17:53:29 +00:00
Amar Takhar
c3881ea772 Some documentation and reformatting
Originally committed to SVN as r4696.
2010-07-19 12:25:53 +00:00
Karl Blomster
9def56b61c fix compilation under visual studio
Originally committed to SVN as r4695.
2010-07-19 01:28:52 +00:00
Karl Blomster
cd810ae1c0 fix compilation of the avs provider
Originally committed to SVN as r4694.
2010-07-19 01:08:09 +00:00
Amar Takhar
12014b944e Remove unused macros.
Originally committed to SVN as r4693.
2010-07-18 23:31:21 +00:00
Amar Takhar
d8acbb205c Finish converting the rest to objects.
Originally committed to SVN as r4692.
2010-07-18 23:22:00 +00:00
Amar Takhar
1613a5961f Convert the Subtitles and Audio pages.
Originally committed to SVN as r4691.
2010-07-18 19:29:54 +00:00
Amar Takhar
dff3cb78f6 Start moving each page to it's own class, the first round of changes was intended as a proof-of-concept. Having each page as it's own object will allow for far easier handling of option changes and reverting.
Originally committed to SVN as r4690.
2010-07-18 16:36:31 +00:00
Amar Takhar
92d51d6f34 Move another block of code to reduce later diffs.
Originally committed to SVN as r4689.
2010-07-18 16:33:32 +00:00
Amar Takhar
1626024be8 Shift some code blocks around before modification to make sense of later diffs.
Originally committed to SVN as r4688.
2010-07-18 14:46:16 +00:00
Thomas Goyne
46d03e3e2b Refresh video display after undo/redo.
Originally committed to SVN as r4687.
2010-07-18 05:45:58 +00:00
Thomas Goyne
63cda2d755 Make gl contexts specific to VideoDisplays and only create/use them when the display is shown. Fixes a pile of X11-related assertion failures.
Originally committed to SVN as r4686.
2010-07-18 05:45:52 +00:00
Amar Takhar
f1ea264efc Revert r4684 as the change won't handle nonexistent styles correctly. updates #1232.
Originally committed to SVN as r4685.
2010-07-17 21:08:53 +00:00
Amar Takhar
6705e2fa61 Set the current style directly when updating the dropdown. The old way used Select() which caused an actual commit to happen. This has the side-effect of modifying the file on startup. We currently set the Actor using this method I don't see why doing the same for the Style won't work.
Originally committed to SVN as r4684.
2010-07-17 19:42:44 +00:00
Amar Takhar
c624b20777 Left align microseconds by 6 spaces.
Originally committed to SVN as r4683.
2010-07-17 17:47:59 +00:00
Amar Takhar
5755d7e1a0 Use %ld for size_t in RebuildRecentList, fixes an assert in wxString::Format.
Originally committed to SVN as r4682.
2010-07-16 15:44:54 +00:00
Amar Takhar
d3e9a906aa Use %ld for both wxFileOffset (off_t) and GetTicks() (time_t), also coalesce into a single wxString::Format. This fixes an assert in wx trunk. Unfortunatly it does not fix audio loading due to seperate breakage of libass in r4630:4631. closes #1228.
Originally committed to SVN as r4681.
2010-07-16 10:33:54 +00:00
Thomas Goyne
a32bbab0b6 Add selection-preserving logic to BaseGrid::UpdateMaps and eliminate some unnecessary updates and clears of the maps. Fixes a pile of cases where operations would result in incorrect or no selections, or scrolling to the top of the file.
Originally committed to SVN as r4677.
2010-07-13 05:29:08 +00:00
Thomas Goyne
4a8abae3a3 Kill options.h and options.cpp, which have been empty for a while
Originally committed to SVN as r4676.
2010-07-12 21:49:48 +00:00
Thomas Goyne
9d03e282ea Rewrite the recombine lines algorith to add support for arbitrary selections rather than requiring that each split line be fixed individually.
Originally committed to SVN as r4675.
2010-07-12 07:10:40 +00:00
Thomas Goyne
7e93d78d3a Fix crash when ActiveLine is NULL while video is loaded.
Originally committed to SVN as r4674.
2010-07-12 07:10:34 +00:00
Thomas Goyne
81b75d9f55 Significantly speed up AssLimitToVisibleFilter::ProcessSubs
Originally committed to SVN as r4673.
2010-07-11 03:31:33 +00:00
Thomas Goyne
ab27440853 Fix comment in vfr.cpp
Originally committed to SVN as r4672.
2010-07-11 03:31:28 +00:00
Thomas Goyne
002aad0b29 Don't call CompressForStack on copied AssFiles as the parsed data isn't copied in the first place.
Originally committed to SVN as r4671.
2010-07-11 03:31:19 +00:00
Thomas Goyne
4897f35dfc When deleting the last row of the grid, select the new last row rather than nothing.
Originally committed to SVN as r4670.
2010-07-09 07:31:56 +00:00
Thomas Goyne
c40aa7080a Eliminate almost all uses of AssFile::top.
Originally committed to SVN as r4669.
2010-07-09 07:31:48 +00:00
Thomas Goyne
5e22a0f151 Save selection over undo/redo.
Originally committed to SVN as r4668.
2010-07-09 07:31:43 +00:00
Thomas Goyne
2e5dc176db Rewrite Undo/Redo code
Make the undo and redo stacks non-static members of AssFile, making it
theoretically possible to have multiple open AssFiles with working undo.

Slightly improve tracking of whether the file is modified: saving,
making a change, then undoing the change now results in the file being
shown as unmodified as with most programs with undo.

Add basic undo coalescing support.

Originally committed to SVN as r4667.
2010-07-09 07:31:34 +00:00
Thomas Goyne
518e78ac6f SSA doesn't have a layer field
Originally committed to SVN as r4666.
2010-07-08 07:44:21 +00:00
Thomas Goyne
5c976dc0a0 Make AssDialogue::GetData ~50% faster
Originally committed to SVN as r4665.
2010-07-08 07:15:04 +00:00
Thomas Goyne
1da57a4be5 Make AssStyle::Clone ~15 times faster.
Originally committed to SVN as r4664.
2010-07-08 07:14:55 +00:00
Thomas Goyne
a59d2a8e2e Fix 64-bit compilation errors
Originally committed to SVN as r4663.
2010-07-08 04:50:46 +00:00
Thomas Goyne
acba2c6b63 Rewrite VFR handling in Aegisub.
Kill vfr.h and vfr.cpp and use the libaegisub versions of them instead.

Rather than the globals VFR_Input and VFR_Output, everything related to
frame rate is now part of the video context. Most things which used to
use VFR_Output now call VideoContext::TimeAtFrame etc.; video providers,
rather than modifying VFR_Input directly, now have getters for their
frame rates which VideoContext calls. Read-only public access to
VFR_Input and VFR_Output are still provided (hopefully temporarily) for
a few things which were awkward to do through VideoContext.

The Avisynth provider now might correctly handle VFR MKVs which can be
opened with DirectShowSource but not DSS2.

Rework keyframe handling as well, so that it continues to match the vfr
handling in design and implementation.

Originally committed to SVN as r4662.
2010-07-08 04:29:04 +00:00
Thomas Goyne
9322f95071 Rewrite vfr.cpp in libaegisub with tests. Not yet used by Aegisub itself.
Originally committed to SVN as r4661.
2010-07-07 05:24:16 +00:00
Thomas Goyne
929fa83dd9 Move the bulk of TextFileWriter's logic to libaegisub.
Originally committed to SVN as r4660.
2010-07-07 02:41:46 +00:00
Thomas Goyne
02237f2a7a Make the std::string overloads of IconvWrapper::Convert significantly faster
Originally committed to SVN as r4659.
2010-07-07 02:41:40 +00:00
Thomas Goyne
5ed8bf89f6 Fix gcc build errors
Originally committed to SVN as r4658.
2010-07-06 19:33:09 +00:00
Thomas Goyne
d7ad7e861f Fix occasional truncation problems with Windows-1258
Originally committed to SVN as r4657.
2010-07-06 19:23:16 +00:00
Thomas Goyne
6623239682 Work around BOM-related issues with UTF-32 and UTF-16 with unspecified byte order
Originally committed to SVN as r4656.
2010-07-06 19:23:10 +00:00
Thomas Goyne
ee4c5dee0b Remove charsets which libiconv does not support from charsets.def
Originally committed to SVN as r4655.
2010-07-06 19:23:01 +00:00
Thomas Goyne
2c2dc19f4f Update the time boxes in the video display when video is first loaded
Originally committed to SVN as r4650.
2010-06-30 06:39:27 +00:00
Thomas Goyne
65d40e2408 Fix minor error in vfr.cpp: lines which end exactly on a frame's start time are not visible on that frame.
Originally committed to SVN as r4649.
2010-06-30 06:29:27 +00:00
Thomas Goyne
be1ed9e672 Make visual tools pass around iterators for everything related to visual features rather than a mix of pointers and indices, and clean up feature creation. Fixes a large pile of selection-related bugs.
Originally committed to SVN as r4648.
2010-06-30 06:29:14 +00:00
Thomas Goyne
8bd5b16699 Fix bad lengths for utf-8 strings in text_file_writer.cpp
Originally committed to SVN as r4647.
2010-06-30 01:18:35 +00:00
Niels Martin Hansen
ce4babb192 Update table.copy_deep function to correctly handle self-referencing tables and tables with circular references. Doesn't handle tables with meta-tables overriding regular field get/set behaviour but that isn't intended either way. Also add a test of this.
Originally committed to SVN as r4645.
2010-06-30 00:36:25 +00:00
Niels Martin Hansen
816b12cec6 Fix selection indexes returned from Auto4 Lua macros to be zero-based instead of one-based. Updates #1219.
Originally committed to SVN as r4643.
2010-06-29 23:14:46 +00:00
Thomas Goyne
cac536fc80 On Windows, send debug logging to the debugger rather than stdout.
Originally committed to SVN as r4642.
2010-06-29 23:08:42 +00:00
Niels Martin Hansen
c0b22973fa Change subs edit box text-formatting buttons to use 16x16 images instead of 24x24 images. Also change the buttons to fully auto-size instead of fixing one or both dimensions.
Originally committed to SVN as r4641.
2010-06-29 18:33:22 +00:00
Niels Martin Hansen
f07c8f031e Clean up About box:
Update year to include 2010 (a little late for that...)
Fix bitmap not showing up.
Make control creation and layout simpler.

Originally committed to SVN as r4640.
2010-06-29 17:48:17 +00:00
Niels Martin Hansen
3589353641 Add some real exception catching to our wxApp class, now we should be able to get decent messages from all exceptions thrown inside event handlers.
Originally committed to SVN as r4639.
2010-06-29 10:31:15 +00:00
Niels Martin Hansen
201f654ca9 Fix option data type for the version check auto check toggle, avoid insane exception when closing version check result dialogue.
Originally committed to SVN as r4638.
2010-06-29 10:06:19 +00:00
Niels Martin Hansen
37cd66c950 Make the cool stuff in r4606 a little less cool, but apparently wxGtk doesn't let you freeze invisible windows and get away with it, so we'll have to live with a little extra flicker.
Originally committed to SVN as r4636.
2010-06-28 22:15:40 +00:00
Grigori Goronzy
6589d258ce Merge r4634.
Originally committed to SVN as r4635.
2010-06-28 11:14:00 +00:00
Thomas Goyne
b0afd8659c Frame data does need to be uploaded to the video card on every change as the subtitles and video frame are not seperate.
Originally committed to SVN as r4633.
2010-06-28 07:39:42 +00:00
Thomas Goyne
a3ff2cc746 Switch visual tools over to using GetSelectedSet for everything
Originally committed to SVN as r4632.
2010-06-28 07:39:36 +00:00
Thomas Goyne
5588cda268 Significantly revamp how visual tools interact with the rest of the program
Rather than just have a single Refresh method that gets called whenever
something happens that could possibly be of interest to the visual
tools, add seperate methods for signaling frame number changes and
changes to the file, and use the new SelectionController stuff for other
things that used to merit a Refresh. This eliminates a large amount of
redundant reparsing of lines which happened on paint, as well as a large
number of redundant repaints.

Frame data is now only uploaded to the video card when the frame number changes
rather than when anything at all changes, slightly improving performance when
using mesa's software opengl implementation.

Vector clip and drag tools now do a slightly better job of not
discarding the user's selection for no apparent reason, and strange
selection behavior from clicking on visual features should now be
entirely fixed.

Everything but the constructor and toolbar event handler in the visual
tool implementations are now private.

Originally committed to SVN as r4631.
2010-06-28 07:13:15 +00:00
Thomas Goyne
d30326b20d Don't create the default visual tool until video is loaded so that visual tools can assume video is loaded.
Originally committed to SVN as r4630.
2010-06-28 07:13:08 +00:00
Thomas Goyne
dfb844b6ab Make lines_added and lines_removed in SelectionListener::OnSelectedSetChanged mutually exclusive.
Originally committed to SVN as r4629.
2010-06-28 07:13:03 +00:00
Thomas Goyne
574a247559 Fix segfault caused by AssExportFilterChain not getting initialized.
Originally committed to SVN as r4628.
2010-06-28 07:12:57 +00:00
Thomas Goyne
894d55d7a2 Add overload of GetSelectedSet that just returns the selection
Originally committed to SVN as r4627.
2010-06-28 07:12:52 +00:00
Thomas Goyne
9ff34fb00d Revert r4612: "Remove redundant handler for ctrl-clicking the grid", as I completely misread what the code was doing.
Originally committed to SVN as r4626.
2010-06-28 07:12:36 +00:00
Amar Takhar
743997b266 Make the logging for charset detection more useful by print the detected character set(s)
Originally committed to SVN as r4625.
2010-06-27 20:03:38 +00:00
Thomas Goyne
af5d34590a Sort styles after lowercasing them rather than before so they actually get in the right order.
Originally committed to SVN as r4624.
2010-06-27 07:53:36 +00:00
Thomas Goyne
cd0378519d Add float overload to VariableData and use it in visual_tool.cpp rather than pretending that float* and double* are the same thing.
Originally committed to SVN as r4623.
2010-06-27 07:53:31 +00:00
Thomas Goyne
75d9ecd14a Fix selection issues with visual tools
Originally committed to SVN as r4622.
2010-06-27 07:53:25 +00:00
Thomas Goyne
7f7771bcdc Remove unused variables
Originally committed to SVN as r4621.
2010-06-27 07:53:20 +00:00
Thomas Goyne
caba46bf0b Remove features for deleted control points
Originally committed to SVN as r4620.
2010-06-27 07:53:14 +00:00
Thomas Goyne
dc2836e9e5 Fix bug where features for the wrong line were displayed in the rectangular clip tool
Originally committed to SVN as r4619.
2010-06-27 07:53:08 +00:00
Thomas Goyne
44888bb008 Reenable Start/Cancel buttons in the font collector dialog even if the collection fails.
Originally committed to SVN as r4618.
2010-06-27 05:05:44 +00:00
Thomas Goyne
7c4bf32566 Don't allow deselection of the only selected line
Originally committed to SVN as r4617.
2010-06-27 04:55:19 +00:00
Thomas Goyne
11b30c8bb4 When the active line is deselected via ctrl-clicking, set the active line to a line which is selected.
Originally committed to SVN as r4616.
2010-06-27 04:55:14 +00:00
Thomas Goyne
74d887a4c4 Add ctrl-shift-click block selection adding
Originally committed to SVN as r4615.
2010-06-27 04:55:08 +00:00
Thomas Goyne
2f80c6b26a Update lastRow when rows are ctrl-clicked
Originally committed to SVN as r4614.
2010-06-27 04:55:03 +00:00
Thomas Goyne
a47080137d Repaint rows when they are added or removed from the selection
Originally committed to SVN as r4613.
2010-06-27 04:54:58 +00:00
Thomas Goyne
4db892935c Remove redundant handler for ctrl-clicking the grid
Originally committed to SVN as r4612.
2010-06-27 04:54:52 +00:00
Thomas Goyne
934da32931 Select the first line when opening a file
Originally committed to SVN as r4611.
2010-06-27 04:54:46 +00:00
Thomas Goyne
5598b787c7 Fix gcc build errors
Originally committed to SVN as r4610.
2010-06-27 03:24:03 +00:00
Niels Martin Hansen
c5c306f90c Make SubtitlesGrid::InsertLine() smarter about updating maps, saves quite a lot of time on big insertions.
Originally committed to SVN as r4609.
2010-06-26 15:49:05 +00:00
Niels Martin Hansen
22de62de77 Add selection change notification batching to the grid. This doesn't seem to actually improve performance, it might rather be line inserts that are glacial.
Originally committed to SVN as r4608.
2010-06-26 15:40:10 +00:00
Niels Martin Hansen
4c604931aa Fix mistake in DummySelectionController template class, should make G++ a little happier.
Originally committed to SVN as r4607.
2010-06-26 14:26:38 +00:00
Niels Martin Hansen
52627a0fc5 Show splash screen much earlier, and show main window much later. Also be smoother about the display of the main window, avoid flickery relayouting. Remove splash screen "click to close" behaviour as well as timed close, just hide it when the main window has been shown.
Originally committed to SVN as r4606.
2010-06-26 14:16:59 +00:00
Niels Martin Hansen
c15f0ada62 Be more sure the audio display's grid pointer is initialised properly. Should fix audio loading.
Originally committed to SVN as r4605.
2010-06-26 14:09:15 +00:00
Niels Martin Hansen
c9c2fa6404 Move "active line" responsibility to the grid. There are at the very least a bunch of redraw issues that need to be sorted out, probably much worse things are hiding.
Originally committed to SVN as r4604.
2010-06-26 11:32:16 +00:00
Niels Martin Hansen
c4a27da4fc Change the grid to use more sensible maps to keep track of index/object mappings for subtitle lines, and follow the SelectionController model. (Hopefully the new maps can also give slightly better performance.)
Try to keep the original API intact. Some redundant or unused functions in SubtitleGrid were removed. The LoadFromAss() function was renamed to UpdateMaps() since that was its real purpose. (Note that SubtitleGrid now has an UpdateMaps() function that overshadows BaseGrid::UpdateMaps(), but SubtitleGrid::UpdateMaps() calls the hidden function. They are not virtual.)
This does not yet fix visual tool feature selection.
Generally, things just feel more broken still. Further work will fix things.

Originally committed to SVN as r4603.
2010-06-26 07:26:27 +00:00
Niels Martin Hansen
70d41d31b2 Remove the SelectionChangeSubscriber mechanism from the grid and implement some basic selection change notification through SelectionController.
Change SelectionListener interface so it receives the set of lines added and removed from selection, instead of just the complete new selection.
Update VisualTool<> to use SelectionListener to receive selection change notifications.

This change (temporarily, I hope) breaks feature selection in visual drag mode, when changing selection via the grid. This is caused by the grid selection change first clearing the entire selection, which sends a separate notification about selection clear. This causes the last visual feature to be deselected, and then the visual tool base reselects the active line, causing a new notification for selection to be sent. The active line happens to be the newly clicked line, and the selection notification enters during the externalChange guard being set, and is then ignored for feature update purposes. When control returns to the original SelectRow call in the grid, the line to be selected has already been selected and then nothing happens.
The best fix is to avoid two notifications being required to deselect all then reselect one line in the first place, so making the grid selection handling saner is the best fix.

Originally committed to SVN as r4602.
2010-06-26 04:38:02 +00:00
Niels Martin Hansen
e60d476f4a Turn BaseGrid into a do-nothing SelectionController<AssEntry>.
Originally committed to SVN as r4601.
2010-06-25 01:49:12 +00:00
Niels Martin Hansen
1a626bb14e Add SelectionController adapted from ADR branch, now templatized on the item data type. Intentionally not making this a merge, the selection controller needs to logically come from trunk into ADR, even if it was added there originally.
Originally committed to SVN as r4600.
2010-06-25 01:44:29 +00:00
Niels Martin Hansen
4f0982c7d5 "Intelligently" append dialogue lines to the end of the Events section instead of to the absolute end of file. This will make appending lines slower if attachments are present, but much safer. Updates #1211.
Originally committed to SVN as r4598.
2010-06-24 20:48:49 +00:00
Niels Martin Hansen
6b36d730af Fix attachments dialogue infinite looping if closed with attachments present. Updates #1212.
Originally committed to SVN as r4596.
2010-06-24 20:43:23 +00:00
Niels Martin Hansen
a71b83f61c Add some docstrings to Auto4 LuaAssFile class.
Originally committed to SVN as r4595.
2010-06-24 19:32:23 +00:00
Niels Martin Hansen
eec24ce562 Remove empty attachments sections when the Attachments dialogue is closed. Updates #1212.
Originally committed to SVN as r4593.
2010-06-24 19:14:13 +00:00
Thomas Goyne
e2a42ccb6c If undo/redo would result in there being no lines selected, select the last line
Originally committed to SVN as r4592.
2010-06-24 07:16:21 +00:00
Thomas Goyne
d8e8f9eb68 Fix bad option names
Originally committed to SVN as r4591.
2010-06-24 06:26:44 +00:00
Niels Martin Hansen
3b1189a8b2 Make attachments dialogue set undo points. Updates #1216.
Originally committed to SVN as r4590.
2010-06-24 06:13:51 +00:00
Niels Martin Hansen
7521d2d29d Fix AssAttachment::Clone() not being const causing it to not override AssEntry::Clone(), and make sure the group field is also copied during cloning. Updates #1216.
Originally committed to SVN as r4589.
2010-06-24 06:13:06 +00:00
Amar Takhar
8e912e3ff6 Include <algorithm> to get std::for_each
Originally committed to SVN as r4587.
2010-06-24 01:51:18 +00:00
Amar Takhar
46da1e538d Merge r4450 to unbreak non precompiled header building.
Originally committed to SVN as r4586.
2010-06-24 01:50:16 +00:00
Amar Takhar
b5ed0d6c8c wrap config.h include under LAGI and put -DLAGI when compiling to ensure it's only included when building libaegisub.
Originally committed to SVN as r4585.
2010-06-24 01:49:48 +00:00
Thomas Goyne
4f53324ca3 Add the name of the option to OptionValue's error messages
Originally committed to SVN as r4582.
2010-06-24 01:24:49 +00:00
Thomas Goyne
e2f8e69612 Beat some semblance of sanity into ass_override and related files. Fixes a pile of crashes when tags are missing expected parameters.
Originally committed to SVN as r4581.
2010-06-24 01:24:43 +00:00
Thomas Goyne
c64e764648 Make AssFixStylesFilter an order of magnitude faster
Originally committed to SVN as r4580.
2010-06-24 01:24:37 +00:00
Thomas Goyne
d1f36bdc43 Eliminate unnessesary character set conversions in TextFileWriter
Originally committed to SVN as r4579.
2010-06-24 01:24:32 +00:00
Thomas Goyne
53fb43c7e6 Fix significantly incorrect handling of pretty much everything in AssTransformFramerateFilter and make it better at deciding when it actually needs to do anything.
Originally committed to SVN as r4578.
2010-06-24 01:24:26 +00:00
Thomas Goyne
627d423017 Fix memory leak in VariableData
Originally committed to SVN as r4577.
2010-06-24 01:24:21 +00:00
Thomas Goyne
cf9eef80ab Fix memory leak in AssLimitToVisibleFilter
Originally committed to SVN as r4576.
2010-06-24 01:24:15 +00:00
Thomas Goyne
2b47f34e76 Fix a pile of actual memory leaks
Originally committed to SVN as r4575.
2010-06-24 01:24:09 +00:00
Thomas Goyne
cbf201ab86 Fix some "leaks" of things that should actually be alive for the lifetime of the program to reduce noise.
Originally committed to SVN as r4574.
2010-06-24 01:24:02 +00:00
Thomas Goyne
50d1b3ed2d Rewrite the ass parsing code in visual_tool.cpp, eliminating a lot of repeated code and making it better at finding the correct values.
Originally committed to SVN as r4573.
2010-06-24 01:23:43 +00:00
Amar Takhar
4bb8e8ea22 Merge r4550: remove wx headers.
Originally committed to SVN as r4572.
2010-06-23 13:20:24 +00:00
Thomas Goyne
a40b9c4b91 Simplify and speed up AssFile's copy constructor and assignment operator.
Originally committed to SVN as r4565.
2010-06-22 00:03:33 +00:00
Thomas Goyne
7958f85ef3 Remove pointless call to AssDialogue::SetEntryData in AssFile::CompressForStack; makes pushing files onto the undo stack about 50% faster
Originally committed to SVN as r4564.
2010-06-22 00:03:28 +00:00
Thomas Goyne
5ed401d23d Use vector<int> instead of vector<bool> for tracking which rows are selected. Makes undo roughly twice as fast.
Originally committed to SVN as r4563.
2010-06-22 00:03:22 +00:00
Thomas Goyne
358b2734da Fix crash when pasting over
Originally committed to SVN as r4562.
2010-06-22 00:03:16 +00:00
Thomas Goyne
8756dc1800 Add copy constructor to AssDialogue and use it in Clone
Originally committed to SVN as r4561.
2010-06-22 00:03:11 +00:00
Thomas Goyne
fe9aa56d10 Remove pointless IntSwap function from utils.h
Originally committed to SVN as r4560.
2010-06-22 00:03:03 +00:00
Niels Martin Hansen
e5eb91a269 * Fix bug in SRT parsing: In some cases a blank line too much is counted.
* Make SRT no longer coalesce line breaks, Aegisub will now write SRT files with blank lines in subtitles.
Updates #1213.

Originally committed to SVN as r4558.
2010-06-20 19:42:13 +00:00
Niels Martin Hansen
2fc8420ee9 Rewrite SRT parsing to use more flexible algorithm, allow more freeform files. Updates #1213.
Originally committed to SVN as r4557.
2010-06-20 19:07:43 +00:00
Niels Martin Hansen
4c01f9a36b Declare a SubtitleFormatParseError exception, its ancestry might not be final yet. (I'm thinking it needs a file format error class as base, which in turn inherits from agi::InvalidInput.) Updates #1213 in preparation for the actual patch.
Originally committed to SVN as r4556.
2010-06-20 19:04:58 +00:00
Niels Martin Hansen
5bd0981a72 Make AssFile::Load catch agi::Exception and report it properly. The catching of reading/parsing errors probably doesn't really belong there, but just making things work for now. Updates #1213 in preparation for the actual patch.
Originally committed to SVN as r4555.
2010-06-20 19:03:05 +00:00
Thomas Goyne
363198b2fa Add missing config:: in windows-specific code and move appname setting back before config file loading
Originally committed to SVN as r4549.
2010-06-18 07:23:17 +00:00
Thomas Goyne
cfa1758d2a Improve the handling of selected features in the vector clip tool and moderately improve performance
Originally committed to SVN as r4548.
2010-06-18 07:14:23 +00:00
Thomas Goyne
227f6b1d69 In the vector clip tool, draw the line to be inserted between the right points when there are multiple paths in the clip
Originally committed to SVN as r4547.
2010-06-18 07:14:17 +00:00
Thomas Goyne
6830fbe1ba Fix bug where the color spectrum sometimes would not repaint when it changed
Originally committed to SVN as r4546.
2010-06-18 07:14:11 +00:00
Thomas Goyne
3376a2d76a Always repaint the video display when the mouse enters it if visual tools are only shown on mouseover
Originally committed to SVN as r4545.
2010-06-18 07:14:06 +00:00
Thomas Goyne
961365dfff Make rotation and scale tools set all selected lines rather than just the active one
Originally committed to SVN as r4544.
2010-06-18 07:14:00 +00:00
Thomas Goyne
afec51c4ed Include config.h in lagi_pre.h so that the conditional inclusion of sys/time.h actually works
Originally committed to SVN as r4543.
2010-06-18 06:59:55 +00:00
Amar Takhar
8ee9737b6f Move mru,opt objects out of the main singleton and into a global config:: namespace. With exception of the log object these are initialised during startup to ensure they are initalised after the log object.
Originally committed to SVN as r4538.
2010-06-18 02:23:27 +00:00
Thomas Goyne
75bd20a6dd Fix the rest of the build errors when not using precompiled headers
Originally committed to SVN as r4530.
2010-06-17 00:23:44 +00:00
Thomas Goyne
61138e9b5d Add configure check for sys/time.h
Originally committed to SVN as r4529.
2010-06-16 07:49:35 +00:00
Thomas Goyne
d6b68dfb25 Kill VideoContext::Refresh's arguments; one has never actually done anything and the other is the same in all places where Refresh is called.
Originally committed to SVN as r4528.
2010-06-16 06:20:39 +00:00
Thomas Goyne
faf2e562cd Rename FrameMain::SubsBox to SubsGrid for consistency with the rest of Aegisub.
Originally committed to SVN as r4527.
2010-06-16 06:20:33 +00:00
Thomas Goyne
43f3502043 Eliminate double inclusion of frame_main.h and remove #pragma once
Originally committed to SVN as r4526.
2010-06-16 06:20:27 +00:00
Thomas Goyne
392ce99083 Kill AssDialogue::UpdateData, which last had a non-empty body 3.5 years ago
Originally committed to SVN as r4525.
2010-06-16 06:20:19 +00:00
Thomas Goyne
8086fae633 Document AssFile's public methods
Originally committed to SVN as r4524.
2010-06-16 06:20:14 +00:00
Thomas Goyne
166c95975b Templatize VariableData's getters and setters
Originally committed to SVN as r4523.
2010-06-16 06:20:06 +00:00
Thomas Goyne
c7ea710267 Use VideoContext::JumpToTime where appropriate
Originally committed to SVN as r4522.
2010-06-16 06:19:49 +00:00
Niels Martin Hansen
0e155767ae Add missing includes to MSVC libaegisub project
Originally committed to SVN as r4519.
2010-06-14 21:35:57 +00:00
Karl Blomster
fec1f47501 Make configure not break on testing for newer ffmpeg's by hardcoding a #define into the test program. This is pretty dumb but I don't know about autotools to fix it properly and it's not like it matters. Why is it compiling C code as extern "C" with a C++ compiler, anyway?
Originally committed to SVN as r4516.
2010-06-14 21:11:01 +00:00
Karl Blomster
0061a58210 Fix the ffmpeg configure test so it doesn't try to use a function that has been deprecated for well over a fucking year and a half (since before 0.5, in fact).
Originally committed to SVN as r4515.
2010-06-14 20:55:35 +00:00
Thomas Goyne
5338a60cdb Fix compilation errors when not using precompiled headers
Originally committed to SVN as r4511.
2010-06-14 19:26:27 +00:00
Amar Takhar
340cc1d7f1 Fix compilation with precompiled headers disabled.
Originally committed to SVN as r4504.
2010-06-14 18:02:58 +00:00
Amar Takhar
6989daa086 Merge r4497 to unbreak the build
Originally committed to SVN as r4498.
2010-06-13 06:21:43 +00:00
Amar Takhar
461616a47f Hook up default_path.json to the build
Originally committed to SVN as r4491.
2010-06-13 01:43:19 +00:00
Amar Takhar
f497144525 Fix syntax errors
Originally committed to SVN as r4490.
2010-06-13 01:42:50 +00:00
Amar Takhar
d8a9bac4b0 Handle the lack of a pre-existing config file.
Originally committed to SVN as r4489.
2010-06-13 01:29:32 +00:00
Karl Blomster
0a590aea04 Add the __STDC_CONSTANT_MACROS define to the ffms2 CFLAGS. Fixes compilation with newer ffmpeg's.
Originally committed to SVN as r4488.
2010-06-12 14:52:13 +00:00
Karl Blomster
ea6dac551e Update ffms2 to r312. Fixes a bunch of rather critical bugs.
Originally committed to SVN as r4487.
2010-06-12 14:51:33 +00:00
Amar Takhar
60b9e5dee6 Define _X86_ so univeralchardet builds properly, this eventually needs to be fixed to use the autodetection code already in configure.in
Originally committed to SVN as r4486.
2010-06-12 07:04:46 +00:00
Amar Takhar
cbdb906da0 Build universalchardet before libaegisub.
Originally committed to SVN as r4485.
2010-06-12 07:04:12 +00:00
Amar Takhar
b1a0142c93 Fix r4483, close conditionals (i was a bit zealous in cutting.)
Originally committed to SVN as r4484.
2010-06-12 06:51:25 +00:00
Amar Takhar
74905e5f4d FFMPEG A/V providers were removed a long time ago, also add OSS as the alternative global before PA.
Originally committed to SVN as r4483.
2010-06-12 05:50:27 +00:00
Amar Takhar
cd62441b70 Fix some status outputs, updates #1170, requires merging
Originally committed to SVN as r4482.
2010-06-12 05:48:02 +00:00
Amar Takhar
c95eb3fcce universalchardet is no longer optional.
Originally committed to SVN as r4481.
2010-06-12 05:29:01 +00:00
Karl Blomster
62b63ca5b6 Fix a missing property sheet in the libaegisub vcproj
Originally committed to SVN as r4480.
2010-06-11 23:45:23 +00:00
Thomas Goyne
ccdc863496 Fix copy/paste error in r4244
Originally committed to SVN as r4479.
2010-06-11 02:25:40 +00:00
Thomas Goyne
40da39e1c8 Make updating the subtitle preview window roughly 50% faster
Originally committed to SVN as r4478.
2010-06-11 02:25:34 +00:00
Thomas Goyne
4ef9d41601 Don't require that subtitles passed to SubtitlesProvider::LoadSubtitles be a copy that can be deleted
Originally committed to SVN as r4477.
2010-06-11 02:25:28 +00:00
Thomas Goyne
72cbf4939f Fix flickering in color picker
Originally committed to SVN as r4476.
2010-06-11 02:25:23 +00:00
Thomas Goyne
8c8e668758 Only include libresrc.h once rather than once per file packed
Originally committed to SVN as r4475.
2010-06-11 02:25:18 +00:00
Thomas Goyne
de974fb723 Cast the correct parameter when ICONV_POSIX is defined
Originally committed to SVN as r4474.
2010-06-11 02:25:13 +00:00
Thomas Goyne
612b583e2b Move cajun includes into the cpp files rather than headers so that only files in libaegisub include them.
Originally committed to SVN as r4473.
2010-06-11 02:25:07 +00:00
Thomas Goyne
c290b6b811 Silence some prefast warnings
Originally committed to SVN as r4472.
2010-06-11 02:24:59 +00:00
Amar Takhar
bc40eeb827 Don't use a wxChar for exception messages.
Originally committed to SVN as r4471.
2010-06-10 04:52:47 +00:00
Amar Takhar
2c703a3baa Remove instances of ^USER and swap them with ^CONFIG, ^USER will still exist but won't be in the default config. Also add 'last opened' paths.
Originally committed to SVN as r4470.
2010-06-09 23:45:05 +00:00
Thomas Goyne
d278c99652 Make the color picker dialog update the color instantly when used from the style editor, rather than waiting for the dialog to be closed, and revert if the dialog is cancelled. Updates #355.
Originally committed to SVN as r4469.
2010-06-09 08:14:50 +00:00
Amar Takhar
ea577f8245 Re-work types.h for the second time, this is most likely not the final version, it's difficult to figure out a solution that makes the most sense when most of the code hasn't been written/moved over yet.
Originally committed to SVN as r4468.
2010-06-09 02:07:43 +00:00
Amar Takhar
9a3e1c58f0 Use an std::string for now when printing messages.
Originally committed to SVN as r4467.
2010-06-09 02:06:37 +00:00
Amar Takhar
3516b4ce74 Add a vsprops file to bring in include files for iconv, and in the future other contrib headers.
Originally committed to SVN as r4466.
2010-06-09 01:11:38 +00:00
Amar Takhar
931cc7f461 * Remove all instances of wxLogDebug and replace them with LOG_W, LOG_D, LOG_E and LOG_D_IF as required.
* Add LOG_(D|W|I)_IF for conditional logging.

Originally committed to SVN as r4465.
2010-06-08 23:21:39 +00:00
Amar Takhar
653ce8b13d Fix misspelled option name
Originally committed to SVN as r4464.
2010-06-08 12:07:56 +00:00
Thomas Goyne
f361d1a67b Add support for rendering vector clips with multiple 'm' commands.
Originally committed to SVN as r4463.
2010-06-08 06:09:19 +00:00
Thomas Goyne
c7da8d9f61 Store OptionValues used by VideoContext
Originally committed to SVN as r4462.
2010-06-08 06:09:13 +00:00
Thomas Goyne
a12ec002c6 Fix crash when framestepping caused by an incorrect option name.
Originally committed to SVN as r4461.
2010-06-08 06:09:08 +00:00
Thomas Goyne
ae099a3363 Vector clip tool always needs to repaint in modes 1-4.
Originally committed to SVN as r4460.
2010-06-08 06:09:02 +00:00
Thomas Goyne
b867eec7f3 Make the vector clip visual tool use vertex arrays rather than immediate mode to render the spline
Originally committed to SVN as r4458.
2010-06-07 07:24:43 +00:00
Thomas Goyne
fae2af36fc Only draw the line to the cursor in the rotatez tool if the cursor is over the video display.
Originally committed to SVN as r4457.
2010-06-07 07:24:37 +00:00
Thomas Goyne
83e35ac63d Only rerender the video display on mouse events if display will actually change
Originally committed to SVN as r4456.
2010-06-07 07:24:30 +00:00
Thomas Goyne
1b27b77ac3 Add glext.h to the precompiled header
Originally committed to SVN as r4455.
2010-06-07 07:24:25 +00:00
Thomas Goyne
303f4990a5 Update glext.h to a version that isn't four years old
Originally committed to SVN as r4454.
2010-06-07 07:24:18 +00:00
Amar Takhar
ad0241e3df Add default_menu.json for safe keeping, I'm not sure if this is the final format.. whatever it ends up being this will be close.
Originally committed to SVN as r4453.
2010-06-07 06:40:19 +00:00
Amar Takhar
d8f5d3bff0 Sigh, revert r4451, I checked this before I comitted but the reason it worked was due to a typo (in this case failure was what i was looking for): to do the const check the values must be initialised otherwise (all/most?) compilers will ignore keywords in a signature check unless you actually try to give it a real value.
Originally committed to SVN as r4452.
2010-06-06 03:24:01 +00:00
Amar Takhar
576d7dd8cc Unlike the other tests the iconv const check is just looking for the actual function signature it doesn't use it, we don't need to initialise anything..
Originally committed to SVN as r4451.
2010-06-06 03:11:41 +00:00
Amar Takhar
059a554d95 Include ../config.h to get AGI_ICONV_CONST from acconf.h.
Originally committed to SVN as r4450.
2010-06-06 03:01:04 +00:00
Thomas Goyne
b49ea0af6f Conditionally const_cast source pointers passed to iconv to avoid invalid cast warnings
Originally committed to SVN as r4449.
2010-06-06 02:53:02 +00:00
Amar Takhar
aa895f9a26 Follow previous conventions and change ICONV_CONST to AGI_ICONV_CONST as wx' defines ICONV_CONST.
Originally committed to SVN as r4448.
2010-06-06 02:46:36 +00:00
Amar Takhar
b249faf6ce Use uintptr_t which is guaranteed to fit a pointer unlike int.
Originally committed to SVN as r4447.
2010-06-06 02:41:04 +00:00
Amar Takhar
4d9ff8d626 * Set ICONV_CONST to 1 if iconv is const or not, aparrantly this differs between versions (annoying!)
* Remove -fpermissive, this was required long ago but now there are only a couple of trivial fixes to make.

Originally committed to SVN as r4446.
2010-06-06 02:40:29 +00:00
Amar Takhar
2aeb0bdffb Sigh, -ansi isn't the solution since other compilers may define 'unix', for now the namespace has been called u_nix, hopefully this is safe but who knows...
Originally committed to SVN as r4445.
2010-06-06 02:32:50 +00:00
Amar Takhar
acc9e53714 Remove stray ;'s
Originally committed to SVN as r4444.
2010-06-05 23:44:07 +00:00
Amar Takhar
b01855ecbd Add -ansi to CPPFLAGS which stops GCC from being stupid and defining unprefixed pp macros (such as "unix"), while i'm here add -pedantic
Originally committed to SVN as r4443.
2010-06-05 23:42:49 +00:00
Thomas Goyne
3fbdf5b7e5 Make the vector clip tool mask based on winding number so that the masking matches VSFilter's clipping.
Originally committed to SVN as r4442.
2010-06-05 22:40:16 +00:00
Niels Martin Hansen
ff34a08afd Make update checker use a compile-time list of tags to determine the appropriate updates to list, instead of a hard-coded OS check. The list of accepted tags is defined by the UPDATE_CHECKER_ACCEPT_TAGS macro. If this macro is undefined, the update checker will still compile, but will reject all updates with tags.
Updates #1132.

Originally committed to SVN as r4440.
2010-06-05 20:16:30 +00:00
Amar Takhar
2d9eee4ea9 Add struct tm which mimics the struct on unix. Also setup the types file into seperate namespaces for clarity. The corrosponding change to windows/utils.cpp snuck into r4437.
Originally committed to SVN as r4438.
2010-06-05 18:17:55 +00:00
Amar Takhar
1a7052040a Remove useless whitespace, I need to setup msvc to disable all it's auto-indentation features which are terrible.
Originally committed to SVN as r4437.
2010-06-05 18:16:16 +00:00
Amar Takhar
1c3f6ed111 Remove rpath hardcoding it's no longer needed.
Originally committed to SVN as r4434.
2010-06-04 13:04:50 +00:00
Amar Takhar
abe6c734f4 Add dependency on iconv.
Originally committed to SVN as r4433.
2010-06-04 13:01:31 +00:00
Amar Takhar
083f1175a6 Remove iconv library dependency as this is brought in from libaegisub.
Originally committed to SVN as r4432.
2010-06-04 12:59:49 +00:00
Thomas Goyne
eff4dcf404 Fix might-as-well-be-inifinite loop in VisualToolVectorClip
Originally committed to SVN as r4431.
2010-06-04 03:08:10 +00:00
Thomas Goyne
38d922c57a Remove time-consuming reparsing of the line in VisualTool::SetOverride
Originally committed to SVN as r4430.
2010-06-04 03:08:04 +00:00
Thomas Goyne
88f6bca9d7 Make ASS tag parsing ~50% faster.
Originally committed to SVN as r4429.
2010-06-04 03:07:58 +00:00
Thomas Goyne
f001651865 Replace AssDialogueBlock::GetAsOverride etc. with dynamic_cast
Originally committed to SVN as r4428.
2010-06-04 03:07:52 +00:00
Thomas Goyne
fe65f778b1 Don't set the line color for every visual feature as it's always the same
Originally committed to SVN as r4427.
2010-06-04 03:07:46 +00:00
Thomas Goyne
2659b79036 Update the edit box less often during visual tool drags, making drags ~20% faster.
Originally committed to SVN as r4426.
2010-06-04 03:07:41 +00:00
Thomas Goyne
625ce943f5 Cache OptionValue objects used by the video display
Originally committed to SVN as r4425.
2010-06-04 03:07:33 +00:00
Thomas Goyne
3d04db9e90 Fix build error when wx was not built with wxUSE_STL
Originally committed to SVN as r4424.
2010-06-03 20:54:46 +00:00
Thomas Goyne
b6d29443a3 Move most character set conversion code to libaegisub and make everything use the new conversion functionality.
Originally committed to SVN as r4423.
2010-06-03 20:32:25 +00:00
Thomas Goyne
7337a11745 Explicitly set the charset to binary when loading subtitles from the video
Originally committed to SVN as r4422.
2010-06-03 20:32:17 +00:00
Thomas Goyne
71300869da Fix order that VisualToolVectorClip's members are initialized
Originally committed to SVN as r4421.
2010-06-03 20:32:10 +00:00
Thomas Goyne
ca24f60a7e Fix memory leak when exporting a file fails
Originally committed to SVN as r4420.
2010-06-03 20:32:03 +00:00
Thomas Goyne
f064624ecd Simplify charset detection
Originally committed to SVN as r4419.
2010-06-03 20:31:43 +00:00
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