Commit graph

2604 commits

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