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

2832 commits

Author SHA1 Message Date
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