Commit graph

1246 commits

Author SHA1 Message Date
Amar Takhar
9c6780a33e * Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking.
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
  otherwise.

Originally committed to SVN as r2718.
2009-01-29 21:32:39 +00:00
Amar Takhar
594d44f594 avutil is required on unix/dawrin, not just darwin.
Originally committed to SVN as r2710.
2009-01-28 23:34:17 +00:00
Amar Takhar
9a6265afb6 * Switch FFMPEG detection to use pkg-config.
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.

Originally committed to SVN as r2705.
2009-01-28 03:19:53 +00:00
Karl Blomster
fe2ec42a45 Fix a really dumb bug in the caching video provider that caused crashes when seeking in the video.
Originally committed to SVN as r2704.
2009-01-24 23:00:35 +00:00
Amar Takhar
bd78a5c60e Instead of generating wxicon_xpm.xpm from icon.ico (which is very low-res)
supply a 48x48 xpm to be included as the application icon.  There's probably a
better way to do this, like figuring out what the typical application icon size
is and supplying different sizes.

Originally committed to SVN as r2702.
2009-01-24 15:58:38 +00:00
Niels Martin Hansen
4ddc90f027 Simple subtitle formats weren't being split-recombined correctly in some cases after modifications, because AssEntrty::StartMS didn't match AssDialogue::Start, which caused sorting to fail.
Make a hacky fix that involves setting StartMS to Start.GetMS() when Clone()ing an AssDialogue.

Originally committed to SVN as r2700.
2009-01-20 20:08:34 +00:00
Amar Takhar
fb557ddf6e Fix restarting aegisub on osx, this uses scripts/osx-bundle-restart-helper.c
(written by jfs) to restart aegisub when it actually quites using KQUEUE to
monitor the process until it dies then executing /usr/bin/open <bundle_path>

Originally committed to SVN as r2689.
2009-01-12 22:54:58 +00:00
Amar Takhar
dc83532e02 Fix restarting after lang/options change (RestartAegisub()).
(this is unix only)

Originally committed to SVN as r2687.
2009-01-12 21:26:44 +00:00
Amar Takhar
439a2c547e * Only list languages if they're actually installed (checking for the existence
of the actual .mo file)
* Add ja to the list of possbile translations.

Originally committed to SVN as r2685.
2009-01-12 21:20:53 +00:00
Amar Takhar
c476b7b883 Add PORTAUDIO_CFLAGS to portaudio static library compile.
Originally committed to SVN as r2684.
2009-01-12 00:21:17 +00:00
Karl Blomster
5e6253831a Fix a bug (introduced when support for w64 was added) that caused the PCM provider to never get used.
Originally committed to SVN as r2682.
2009-01-10 05:41:56 +00:00
Amar Takhar
1468be9860 Remove a commented line, r2676 had the Darwin paths fix for automation
snuck in (svn drives me mad sometimes!)

Originally committed to SVN as r2677.
2009-01-08 08:48:29 +00:00
Amar Takhar
852ceef55d On OS X shared librarys end with .dylib not .so, this fixes the (lame) workaround
for auto3 linking.

Originally committed to SVN as r2676.
2009-01-08 08:46:10 +00:00
Amar Takhar
81a168d625 Add a workaround for dependency_libs in auto3/, libtool brings in libraries
automatically which causes link errors due to auto4 (lua 5.1).

Originally committed to SVN as r2675.
2009-01-08 08:22:53 +00:00
Amar Takhar
24d52e10c9 Forgot to append /AEGISUB_VERSION_DATA to GetDataDir.
Originally committed to SVN as r2673.
2009-01-07 10:40:33 +00:00
Amar Takhar
302f12b472 Add extern "C" around libosxutil.h.
Originally committed to SVN as r2670.
2009-01-07 07:35:28 +00:00
Amar Takhar
ab55433c02 Add libres.cpp to EXTRA_DIST for now until I figure out why it's not working
as it should.

Originally committed to SVN as r2666.
2009-01-06 14:21:15 +00:00
Amar Takhar
d5f5e66e33 * Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
  detection.

Originally committed to SVN as r2664.
2009-01-06 13:59:15 +00:00
Amar Takhar
90062363f3 Really do the aegisub->aegisub-2.1 binary rename.
Originally committed to SVN as r2663.
2009-01-06 13:58:21 +00:00
Amar Takhar
bbe33f2b91 Set bin_PROGRAMS to aegisub-2.1
Originally committed to SVN as r2661.
2009-01-06 12:35:57 +00:00
Amar Takhar
675c4caa09 Add multiple version support, everything is now suffixed with MAJOR.MINOR, this
will allow users on unix to install and operate different versions of aegisub a$
the same time.  Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.

Originally committed to SVN as r2659.
2009-01-06 10:44:49 +00:00
Amar Takhar
2ded1e69db Remove unused files, add config/*.h
Originally committed to SVN as r2651.
2009-01-05 11:51:34 +00:00
Amar Takhar
0c6abb553e Remove a cut-and-past-o
Originally committed to SVN as r2650.
2009-01-05 11:51:13 +00:00
Amar Takhar
25ca1497ab * Add support for setting the default A/V provider and audio player using
--with-provider-(video|audio) and --with-player-audio.
* Cleanup --help alignment
* Print default values at the end of configure
* Remove :'s in end status section headings in configure.

Originally committed to SVN as r2648.
2009-01-05 11:07:14 +00:00
Amar Takhar
37b395310b Add a cheap 'make bundledirs-test' target.
Originally committed to SVN as r2645.
2009-01-04 13:07:57 +00:00
Niels Martin Hansen
79b79d737f Add RestartAegisub() function with obvious purpose.
Replace existing code that restarts Aegisub with a call to that function.

Originally committed to SVN as r2644.
2009-01-04 11:45:06 +00:00
Niels Martin Hansen
c98c5b10b9 Add (untested) test program for libosxutil, to display what the different locations map to.
There is no makefile support for it (yet).

Originally committed to SVN as r2643.
2009-01-04 11:10:51 +00:00
Niels Martin Hansen
00d15ee4db Add OSX_GetBundlePath() to libosxutil
Originally committed to SVN as r2642.
2009-01-04 11:09:53 +00:00
Amar Takhar
732970fe56 Set default locale to en_US and disable tooltips on startup, for whatever
reason both of these break when loading (to be fixed later).

Originally committed to SVN as r2639.
2009-01-04 10:26:14 +00:00
Amar Takhar
bf09c76081 Remove posix dir and 'libposix' and create 'libresrc' which includes
resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
2009-01-04 09:01:49 +00:00
Amar Takhar
e66eed8126 Remove -include posix/defines.h
Originally committed to SVN as r2625.
2009-01-04 07:02:28 +00:00
Amar Takhar
7e9f898c34 * Add -I../aegisub to libass/Makefile.am
* Remove res.h from config/config_unix.h
* Add posix/res.h to config.h (temp)

Originally committed to SVN as r2624.
2009-01-04 07:01:20 +00:00
Amar Takhar
9238c1b992 Remove WITH_FFMPEGSOURCE as the defines have been self-contained to FFmpegSource2.
Originally committed to SVN as r2623.
2009-01-04 06:56:20 +00:00
Rodrigo Braz Monteiro
7b552282ff Fixed config for MSVC
Originally committed to SVN as r2622.
2009-01-04 06:42:49 +00:00
Amar Takhar
0763541848 Change how configuration works.
* move win32/config0.h -> config/config_windows0.h
  * move win32/stdint.h -> msvc/stdint.h
  * move posix/defines.h -> config/config_unix.h
  * add config.h - brings in config_(windows|unix).h as required
  * add config.h to *.cpp
  * Self-contain FFmpegSource2 with required function defines wrapped with
    __UNIX__ instead of the now removed defines.h.
  * Edit aegisub_vs2008.vcproj to remove explicit inclusion of config.h, also
    change VCPreBuildEventTool to create windows_config.h from
    windows_config0.h.  Add msvc to include path.
  * Change configure to create ./acconf.h instead of posix/acconf.h

This will allow us to create a more standard and platform agnostic way of
configuration aegsisub during build time.

Originally committed to SVN as r2621.
2009-01-04 06:31:48 +00:00
Amar Takhar
da9e5f0cc1 Remove a single debug printf that is no longer required.
Originally committed to SVN as r2615.
2009-01-02 09:30:32 +00:00
Amar Takhar
0c7e784d71 Activate locale support on !__WINDOWS__, using SetInstallPrefix in
standard_paths.cpp allows the program to find the locale files now.

Originally committed to SVN as r2613.
2009-01-02 08:49:43 +00:00
Amar Takhar
fa5e257ead Sigh, why does 'svn commit .' only work sometimes?: Revert aegisublocale.cpp
back to r2595.  r2609 (svn:ignore commit) included debuggin code which is
harmless but not required.

Originally committed to SVN as r2610.
2009-01-02 02:15:32 +00:00
Amar Takhar
3419b99790 Set svn:ignore svn_revision.
Originally committed to SVN as r2609.
2009-01-02 02:13:15 +00:00
Amar Takhar
5523314bb2 Change #ifdef __UNIX__ to #if defined(__UNIX__) && !defined(__APPLE__) as
__UNIX__ is triggered on OS X as well which breaks things when setting
SetInstallPrefix.

Originally committed to SVN as r2608.
2009-01-01 14:01:45 +00:00
Niels Martin Hansen
31be1e68a2 Just don't show BUILD_CREDIT if it isn't defined, and use an ugly workaround in About box (to avoid clobbering the translateable messages.)
Originally committed to SVN as r2607.
2009-01-01 13:16:42 +00:00
Amar Takhar
5b17133fee Use StandardPaths::SetInstallPrefix to set the prefix using INSTALL_PREFIX
which is taken from configure (either default or with --prefix).  This is the
beginings of proper relocation support on UNIX. (thanks jfs!)

Originally committed to SVN as r2606.
2009-01-01 13:10:51 +00:00
Rodrigo Braz Monteiro
cd9faac6b0 Possible fix for crash on aegisublocale.cpp
Originally committed to SVN as r2595.
2009-01-01 05:37:47 +00:00
Rodrigo Braz Monteiro
77095bab39 UNTESTED - Per verm's request, changed listing of locales for non-Windows to use a hardcoded list. Change this to use a proper txt list later.
Originally committed to SVN as r2593.
2009-01-01 02:16:09 +00:00
Niels Martin Hansen
1cce8b4ac7 License headers, documentation comments and changed name of a few functions. (The names were inconsistent.)
Originally committed to SVN as r2588.
2008-12-31 09:40:07 +00:00
Amar Takhar
610a6c11cf Sigh, s/Framwork/Framework/
Originally committed to SVN as r2587.
2008-12-31 09:25:11 +00:00
Amar Takhar
1fd3ffc313 Add 'libosxutil' which gives us functions to locate paths within bundles, for
now this is used by libass to load fontconfig's fonts.conf.

Originally committed to SVN as r2585.
2008-12-31 09:20:50 +00:00
Niels Martin Hansen
9c04724e13 Fix conversion to multibyte strings from widechar strings in FFmpegSource providers. (tomman)
Originally committed to SVN as r2582.
2008-12-31 07:22:24 +00:00
Niels Martin Hansen
234ab505bb Use FINAL_RELEASE define to determine whether to display beta version number or stable version number. (Currently 2.1.6 vs. 2.2.0.)
Originally committed to SVN as r2579.
2008-12-31 05:19:24 +00:00
Amar Takhar
954d7282aa * Create packages/osx_bundle which is a skel of OS X bundles.
* Move aegisub/macosx/*.icns to packages/osx_bundle/Contents/Resources
* Move aegisub/macosx/Info.plist to packages/osx_bundle/Contents/
* Remove aegisub/macosx as it's no longer required.

Originally committed to SVN as r2545.
2008-12-29 03:22:04 +00:00