Commit graph

3820 commits

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