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

2802 commits

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