Commit graph

1093 commits

Author SHA1 Message Date
Alysson Souza
baf52a3430 Applied Harukalover's patch #2 - Added play audio/video buttons to Styling Assistant
Originally committed to SVN as r2190.
2008-05-09 04:27:10 +00:00
Alysson Souza
0de8190b21 Applied Harukalover's patch #1 - Added play audio/video buttons to Translation Assistant
Originally committed to SVN as r2189.
2008-05-09 03:43:47 +00:00
Rodrigo Braz Monteiro
8918fb6296 Added a little very specific hacked up tool that isn't enabled unless you modify config.dat.
Originally committed to SVN as r2185.
2008-04-21 16:41:46 +00:00
Amar Takhar
b012a3149c Freetype/Fontconfig were pushed under two conditionals beacuse on Darwin we use
Freetype to list fonts (it uses native features).  When support for glibc iconv
was added the case broke and set $build_linux, the conditional for the
fontconfig font lister was $build_default which no longer got triggered.  Puts
the font listers under FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon
$build_darwin being no/yes.

Originally committed to SVN as r2180.
2008-04-13 17:44:54 +00:00
Amar Takhar
aa7cc5a2dc Add support for CSRI (ASA), this has been tested and confirmed as working.
Compiling libass/asa in at the same time is OK.

Originally committed to SVN as r2174.
2008-04-13 05:10:27 +00:00
Amar Takhar
0734c81d9e Whoops, re-add nuked } after 'extern "C" {' that got removed when the __WINDOWS__ wrap
was removed.

Originally committed to SVN as r2173.
2008-04-13 04:47:33 +00:00
Amar Takhar
0607976605 Remove the __WINDOWS__ around 'include "../libass/ass.h"', I didn't notice this
on my system since I have ass/ass.h in /usr/local/include.  The header hasn't
changed so no damage done, unless you don't have libass installed.

Originally committed to SVN as r2169.
2008-04-06 15:08:43 +00:00
Niels Martin Hansen
58788ea5ce Change default ALSA output device to something more sensible, namely 'default:0'.
Originally committed to SVN as r2162.
2008-03-31 17:55:21 +00:00
Amar Takhar
7746efa54e * Fix ICONV_CFLAGS / ICONV_LDFLAGS so they're properly propogated during the
build.
* s/ICONV_LIBS/ICONV_LDFLAGS/ to fix the addtion of ICONV_LDFLAGS during final
  linking.

Originally committed to SVN as r2159.
2008-03-30 08:08:43 +00:00
Amar Takhar
0cf6fce7de Add -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries to
aegisub_LDFLAGS, for now we don't do any GL link checks so there is no point in
adding it to configure.

Originally committed to SVN as r2158.
2008-03-30 06:35:00 +00:00
Amar Takhar
cfa2003553 Sigh, really fix the typo(s).
Originally committed to SVN as r2157.
2008-03-30 06:17:08 +00:00
Amar Takhar
cc25285ddd Fix typo that slipped into previous commit.
Originally committed to SVN as r2156.
2008-03-30 06:13:36 +00:00
Amar Takhar
ad63c0fbac Add a check for avutil, conditional on BUILD_DARWIN which is required on OSX.
Originally committed to SVN as r2155.
2008-03-30 06:11:45 +00:00
Amar Takhar
0fb1fee1a8 * Add target platform detection, at the moment this only uses OS info.
* Fix font_file_lister to use fontconfig for unix, freetype for OS X
* Set bevelbutton to be conditional for Darwin only. (this fixes the header
  missing header as well)

Originally committed to SVN as r2152.
2008-03-29 22:30:30 +00:00
Amar Takhar
b7af0a06d5 * Add a detection for platform/arch.
* Add a new condtitional BUILD_DARWIN for fontconfig/freetype font listing
  support.

Originally committed to SVN as r2150.
2008-03-26 23:58:39 +00:00
Niels Martin Hansen
abeaf06776 Possible fix for bevelButton problem
Originally committed to SVN as r2149.
2008-03-26 23:28:12 +00:00
Amar Takhar
3cd825e98b c_str() on _filename.
Originally committed to SVN as r2147.
2008-03-25 23:51:54 +00:00
Amar Takhar
91c641789f Remove #ifdef __APPLE__ glue, this will be the same as UNIX, eventually.
Originally committed to SVN as r2146.
2008-03-25 23:43:28 +00:00
Amar Takhar
ffaac724e1 Remove a !defined(__APPLE__) around #include "lavc_keyframes.h", also add a c_str().
Originally committed to SVN as r2145.
2008-03-25 23:42:39 +00:00
Amar Takhar
5ad19a2558 More .cstr().
Originally committed to SVN as r2144.
2008-03-25 23:08:28 +00:00
Amar Takhar
f0f0d541b6 Add a .c_str(); to _filename (line 83)
Originally committed to SVN as r2143.
2008-03-25 23:01:29 +00:00
Karl Blomster
cd177995d2 added same flag to win64 config0.h.
Originally committed to SVN as r2139.
2008-03-24 12:21:44 +00:00
Karl Blomster
4e3529930d added new config.h define, WITH_STATIC_FFMPEG, to make it possible to link ffmpeg as a static library instead of dynamic.
Originally committed to SVN as r2138.
2008-03-24 12:19:17 +00:00
Karl Blomster
7be56fbcd4 cast some lavc context variables to int (avoids warning treated as error when compiling WITH_FFMPEG on msvc)
Originally committed to SVN as r2137.
2008-03-24 11:30:35 +00:00
pstatic
cbf7143b85 typo in audio_provider_pcm
Originally committed to SVN as r2131.
2008-03-24 02:44:45 +00:00
Niels Martin Hansen
08910b5a9d Make PCM audio provider access the file memory mapped instead of through regular file access, per bug #686. Tested to work on Windows.
I've also added a POSIX implementation but it's untested and might not even build.
The implementation is not actually thread safe, but this shouldn't be a problem in most cases, yet. It should still be fixed at some point.

Originally committed to SVN as r2130.
2008-03-24 00:10:09 +00:00
Amar Takhar
e4d77f6474 Completely remove support for an external libass:
* The internal libass will always be newer than external packages.
  * aegisub requires fontconfig _and_ iconv support, some systems have
    either/or but rarely both.
  * There's zero benifit to supporting an external version.

In the future I might add some flags to allow it, if there is a compelling
reason to.

Originally committed to SVN as r2125.
2008-03-23 22:56:21 +00:00
Karl Blomster
2c495b5d80 casting
Originally committed to SVN as r2119.
2008-03-23 12:36:16 +00:00
Karl Blomster
b6d8b403d6 fix catastrophic failure in last commit
Originally committed to SVN as r2116.
2008-03-22 22:48:59 +00:00
Karl Blomster
e61d333297 warn the user if audio skew is likely
Originally committed to SVN as r2115.
2008-03-22 22:45:46 +00:00
Karl Blomster
76469421e4 minor tweaks to the lavc audio provider.
Originally committed to SVN as r2114.
2008-03-22 22:18:43 +00:00
Amar Takhar
a86a882c0a Remove files not required by the macosx build.
Originally committed to SVN as r2103.
2008-03-22 08:35:30 +00:00
Amar Takhar
ca920eea36 Remove comments about adding revision / build credit support.
Originally committed to SVN as r2102.
2008-03-22 08:24:52 +00:00
Amar Takhar
5da0b16f48 Move WITH_INTERNAL_LIBASS beove WITH_LIBASS for clarity.
Originally committed to SVN as r2101.
2008-03-22 08:24:21 +00:00
Amar Takhar
65e92e8e3c * Sort program sources in alphabetical order.
* Put program headers under aegisub_SOURCES and external headers under
  noinst_HEADERS.

Originally committed to SVN as r2099.
2008-03-22 08:20:28 +00:00
Amar Takhar
04e9ff224f Add support for an 'internal' libass, with this we can chase changes to the
libass in MPlayer which is more up-to-date than the external library that's
available.

Originally committed to SVN as r2096.
2008-03-21 21:01:03 +00:00
Karl Blomster
9a7bbc9b93 missing semicolon in last commit
Originally committed to SVN as r2095.
2008-03-21 20:35:59 +00:00
Karl Blomster
ee04563ff6 attempt at fixing the lavc audio skew problems by making very very sure all data in each packet is decoded.
Originally committed to SVN as r2094.
2008-03-21 20:30:34 +00:00
Karl Blomster
6d8f862aed cleanup of the lavc audio provider; renamed some variables, added some comments and restructured a bit. as an added improvement it will now no longer resample unless strictly necessary.
Originally committed to SVN as r2093.
2008-03-21 19:52:14 +00:00
Rodrigo Braz Monteiro
398da989f9 Fixed small OpenMP bug.
Originally committed to SVN as r2089.
2008-03-21 03:02:39 +00:00
Amar Takhar
21b3db9b2a Enable OpenMP globally, at amz's suggestion. (if this breaks things, it's his
fault.)

Originally committed to SVN as r2088.
2008-03-21 02:59:57 +00:00
Amar Takhar
d71641db51 s/WIN32/__WINDOWS__/ to stop a define collision with universalchardet. This is
a temp solution as the real fix is sorting out universalchardet to build
correctly.

Originally committed to SVN as r2087.
2008-03-21 02:41:46 +00:00
Amar Takhar
2b730ac4fa Move charset_detect.h above text_file_reader.cpp, universalchardet is defining,
or undefining things that doesn't make fstream very happy.

Originally committed to SVN as r2086.
2008-03-21 02:22:00 +00:00
Amar Takhar
90e9e6fef1 Re-enable univerchardet (for now), also make it use STL rather than stdio (which
isn't complete)

Originally committed to SVN as r2085.
2008-03-20 22:24:28 +00:00
Rodrigo Braz Monteiro
735aebb393 Fixed a litle oops from last commit.
Originally committed to SVN as r2084.
2008-03-20 21:58:21 +00:00
Rodrigo Braz Monteiro
db0cc24ae3 Originally committed to SVN as r2083. 2008-03-20 21:48:47 +00:00
Amar Takhar
1f23637cd2 Fix auto4/auto3 (lua51/lua50) support, this removes the --with-* flags in favor
of LUA_(C|LD)FLAGS and LUA50_(C|LD)FLAGS, also add the LUA LDFLAGS to LIBS like
perl in order to have it bring in the symbols properly, this is a temp measure
until we have modules.

Originally committed to SVN as r2082.
2008-03-20 21:24:01 +00:00
Rodrigo Braz Monteiro
b102ed05c1 Fixed dummy video provider and possibly fixed dvd sub generation.
Originally committed to SVN as r2079.
2008-03-18 05:24:21 +00:00
Niels Martin Hansen
3ead72329c Change default font encoding for new styles to 1, to make more fonts behave sensibly by default
Originally committed to SVN as r2064.
2008-03-15 21:34:55 +00:00
Niels Martin Hansen
426917c9a6 The progress dialogues should be centered on parent (too), certainly not on the primary monitor.
Originally committed to SVN as r2057.
2008-03-14 19:40:28 +00:00
Rodrigo Braz Monteiro
78cb8f53ff Applied shurik's patch to hopefully fix Lua's linking issues on Linux.
Originally committed to SVN as r2054.
2008-03-14 06:17:32 +00:00
Karl Blomster
521632cd9b changed output buffer size to AVCODEC_MAX_AUDIO_FRAME_SIZE which is what it's actually malloc()'ed as. might actually work now.
Originally committed to SVN as r2052.
2008-03-14 05:14:30 +00:00
Karl Blomster
56370f0f4a hurf de durf, didn't consider the fact that some audio packets might not have any actual content. return value of avcodec_decode_audio2() is now checked against < 0 again.
Originally committed to SVN as r2051.
2008-03-14 04:38:30 +00:00
Rodrigo Braz Monteiro
72145e8fa8 Fixed some warnings on g++.
Originally committed to SVN as r2046.
2008-03-13 20:27:25 +00:00
Rodrigo Braz Monteiro
cee958b2d3 Raised the warning level on MSVC8 to 4, and fixed several warnings caused by that.
Originally committed to SVN as r2045.
2008-03-13 19:12:55 +00:00
Rodrigo Braz Monteiro
c248ca39f2 Fixed several warnings on g++.
Originally committed to SVN as r2044.
2008-03-13 18:55:09 +00:00
Rodrigo Braz Monteiro
6e5f23c1cd Added missing virtual destructors.
Originally committed to SVN as r2043.
2008-03-13 18:06:13 +00:00
Karl Blomster
3cade86767 check the return value of avcodec_decode_audio2() against <= 0, not just < 0 (both indicate no audio decoded)
Originally committed to SVN as r2042.
2008-03-13 08:41:21 +00:00
Karl Blomster
47f6f2aed6 Replaced deprecated function avcodec_decode_audio() with nondeprecated version avcodec_decode_audio2() in audio_provider_lavc.cpp. Maybe possibly potentially hopefully fixes mp3 decoding problems?
Originally committed to SVN as r2041.
2008-03-13 08:30:40 +00:00
Rodrigo Braz Monteiro
0e3333e4f8 (Hopefully?) fixed auto4-lua colour buttons.
Originally committed to SVN as r2027.
2008-03-12 07:19:05 +00:00
Alysson Souza
e9004aa0f9 Semi-broken support for colour buttons in auto4-lua
Originally committed to SVN as r2026.
2008-03-12 07:04:07 +00:00
Rodrigo Braz Monteiro
0a931d3f45 wxSTC SUCKS. Note: never call SetWindowStyle() on it, or it'll break the keyboard handling.
Originally committed to SVN as r2025.
2008-03-11 23:58:43 +00:00
shb
5ceebc02a2 Maybe a fix to autoperl crashing
Originally committed to SVN as r2024.
2008-03-11 23:30:59 +00:00
Rodrigo Braz Monteiro
ae67877863 Another jab at fixing scintilla control border on posix. Also changed how it looks on Windows XP/Vista.
Originally committed to SVN as r2019.
2008-03-11 07:05:19 +00:00
Amar Takhar
722c1c6dc8 Mutter more library ordering, DynaLoader.a has to be after libauto4_perl.a so
I've used LIBS= for now (not sure if this is right but we'll see)

Originally committed to SVN as r2018.
2008-03-11 06:31:06 +00:00
Rodrigo Braz Monteiro
92d26be928 Hopefully changed scintilla border for wxgtk
Originally committed to SVN as r2017.
2008-03-11 06:30:59 +00:00
Amar Takhar
c3008be27f Aparrantly the CFLAGS to plugin_manager.cpp were never needed in the first
place, it was the result of a missed change for perl automation.

Originally committed to SVN as r2016.
2008-03-11 06:19:20 +00:00
Rodrigo Braz Monteiro
5596fa106e Moved auto3 and perl factories to their own headers to avoid including library headers.
Originally committed to SVN as r2015.
2008-03-11 06:10:00 +00:00
Amar Takhar
cdf86550f2 Sigh, GNU LD can be really annoying at times, most linkers will only pull a
symbol in from a static library if that symbol is used. (how it should work)
However! if you place the library that *uses* those symbols *after* the
libraries that have them, then the gnu ld will skip past those symbols, they
will never get included and you'll get a linking error.. There are two fixes,
tell LD to scan all libraries twice (non-portable?) or just put the libraries in
an order that LD can deal with.  (annoying!)

Originally committed to SVN as r2014.
2008-03-11 06:07:08 +00:00
Amar Takhar
311b78afec Put plugin_manager.cpp into it's own library, since it needs to be sent all
CFLAGS for any enabled automation. (this is temp until we have actual working
plugins)

Originally committed to SVN as r2013.
2008-03-11 05:45:45 +00:00
Amar Takhar
02abe1f0f8 It never ceases to amaze me how badly gawk can munge a perfectly compliant AWK
file, die gawk. die: It ate the line endings on lines wrapped using \ instead of
keeping the CR's it put everything on one line even though hard CR's were used.

Originally committed to SVN as r2012.
2008-03-11 05:41:14 +00:00
Rodrigo Braz Monteiro
7c505f06d4 Improved Aegisub's exception handling and crash log generation.
Originally committed to SVN as r2008.
2008-03-10 06:28:21 +00:00
Niels Martin Hansen
bb31ddb1da Re-introduce the wxBevelButton control of old and use it for Commit button in subs edit area on wxMac builds.
Originally committed to SVN as r2006.
2008-03-09 23:40:45 +00:00
Niels Martin Hansen
7c8e990766 Revert r2004, wxEXPAND looks ugly.
Originally committed to SVN as r2005.
2008-03-09 23:00:03 +00:00
Niels Martin Hansen
f6e12ba05a Experimentally add wxEXPAND flags to style/actor/effect controls to possibly fix alignment problems on Mac.
Originally committed to SVN as r2004.
2008-03-09 22:54:24 +00:00
Niels Martin Hansen
1248cd264f Some changes to subs edit area toolbuttons sizing
Originally committed to SVN as r2003.
2008-03-09 22:31:16 +00:00
Rodrigo Braz Monteiro
c833156e8b Now attempting to solve automation issues with Evolutionary programming: keep changing random shit until something works well, repeat until fixed.
Originally committed to SVN as r2002.
2008-03-09 22:07:17 +00:00
Rodrigo Braz Monteiro
ed7a434a9e More messing around with Lua.
Originally committed to SVN as r2001.
2008-03-09 21:49:46 +00:00
Rodrigo Braz Monteiro
777242fce3 2000 GET!! Changed how the Lua factory is registered.
Originally committed to SVN as r2000.
2008-03-09 21:36:24 +00:00
Rodrigo Braz Monteiro
f8d7c69c15 Changed how the Perl factory is registered.
Originally committed to SVN as r1999.
2008-03-09 21:33:35 +00:00
Niels Martin Hansen
d7ad931526 Rename Automation4::LuaStackcheck::check() to avoid clash with some define somewhere.
Originally committed to SVN as r1998.
2008-03-09 21:09:51 +00:00
Rodrigo Braz Monteiro
f20fc57d22 Possible fix for Perl.
Originally committed to SVN as r1997.
2008-03-09 21:00:55 +00:00
Rodrigo Braz Monteiro
825b2f3af0 Fixed registration of Ruby automation.
p.s.: embedding ruby on vc++ sucks.

Originally committed to SVN as r1996.
2008-03-09 19:01:54 +00:00
Rodrigo Braz Monteiro
a72c3abb3c Changed the way that automation factories are registered.
Originally committed to SVN as r1995.
2008-03-09 18:19:15 +00:00
Rodrigo Braz Monteiro
9f5d3e7a6e More stuff in subs lib.
Originally committed to SVN as r1991.
2008-03-09 17:25:12 +00:00
Rodrigo Braz Monteiro
fe8ed21878 Added a "reverse" option to export framerate.
Originally committed to SVN as r1988.
2008-03-09 05:32:02 +00:00
Rodrigo Braz Monteiro
88b845852a Modifications for 2.1.2
Originally committed to SVN as r1987.
2008-03-09 04:16:52 +00:00
Niels Martin Hansen
49d7b55755 Possible fix for crash in LAVCKeyframes constructor
Originally committed to SVN as r1986.
2008-03-09 00:04:30 +00:00
Rodrigo Braz Monteiro
79b82b9167 Possible fix to lavc crash.
Originally committed to SVN as r1984.
2008-03-08 23:41:24 +00:00
Amar Takhar
48af40fa26 Add include/aegisub/* headers.
Originally committed to SVN as r1981.
2008-03-08 22:22:01 +00:00
Amar Takhar
af18413a7b Remove unused 'beautify' script.
Originally committed to SVN as r1980.
2008-03-08 22:21:44 +00:00
Amar Takhar
0e00389079 Add .c_str() to line 300 (filename).
Originally committed to SVN as r1976.
2008-03-08 20:38:03 +00:00
Amar Takhar
ad1d357c61 ADd missing video_provider_manager.cpp and remove video_provider.cpp.
Originally committed to SVN as r1975.
2008-03-08 20:37:32 +00:00
Rodrigo Braz Monteiro
8227971186 Another battle in the String Hell War
Originally committed to SVN as r1974.
2008-03-08 18:13:42 +00:00
Rodrigo Braz Monteiro
045f60da35 Reverted last commit.
Originally committed to SVN as r1973.
2008-03-08 18:04:51 +00:00
Amar Takhar
ea8d16dabe More s/wxString/Aegisub::String/ changes.
Originally committed to SVN as r1972.
2008-03-08 08:13:46 +00:00
Amar Takhar
fc14717b71 Fix header -> subtitles_provider_manager.h
Originally committed to SVN as r1970.
2008-03-08 07:51:23 +00:00
Amar Takhar
c501ae6e2e Add -Iinclude to the list of CXX_FLAGS.
Originally committed to SVN as r1969.
2008-03-08 07:50:10 +00:00
Amar Takhar
6246c3998d s/wxString/Aegisub::String/ in many places.
Originally committed to SVN as r1967.
2008-03-08 04:27:41 +00:00
Amar Takhar
7c4c825cef Missed a header change in the OpenAL header.
Originally committed to SVN as r1963.
2008-03-07 21:53:46 +00:00