Commit graph

1041 commits

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