mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
2731 commits 10 branches 31 tags 48 MiB
Commit graph

1348 commits

Author SHA1 Message Date
Amar Takhar
218c9877ac Add hidden option 'Audio PortAudio Device' to set the default portaudio output device. 
Originally committed to SVN as r2797.
 2009-04-15 11:26:43 +00:00
Amar Takhar
af84de21ab * Fix paCallback decleration 
* Switch from PaOpenDefaultStream to Pa_OpenStream.
* Add Debug output
* Add GetOutputDevices which returns a list of available devices (unused)

Originally committed to SVN as r2796.
 2009-04-15 10:26:22 +00:00
Niels Martin Hansen
50679014ea Make the default ALSA device default. 
(It should be "default", not "default:0" as the old default was.)

Originally committed to SVN as r2795.
 2009-04-13 17:08:13 +00:00
Amar Takhar
e6a09d383c Move FOUND_AUDIO_PLAYER above the rest of the audio players to preserve 
link ordering.  Also add libaudio_player.a to the final link.

Originally committed to SVN as r2794.
 2009-04-12 10:52:40 +00:00
Amar Takhar
41034545e7 Early morning code-o, setting AM_CONDITIONAL _after_ the Makefiles are 
generated isn't going to work very well.

Originally committed to SVN as r2793.
 2009-04-12 10:48:20 +00:00
Amar Takhar
55afc7c29a * Update comment 
* Include audio_player_portaudio2.h instead of audio_player_portaudio.h.

Originally committed to SVN as r2792.
 2009-04-12 10:30:38 +00:00
Amar Takhar
fb4d7e67e2 Split audio_player.cpp into it's own convenience to avoid sending audio library 
CFLAGS to every source file.

Originally committed to SVN as r2791.
 2009-04-12 10:30:07 +00:00
Amar Takhar
11c341030b Add support for ALSA_(LD|C)FLAGS. 
Originally committed to SVN as r2790.
 2009-04-12 10:28:42 +00:00
Amar Takhar
f6d8cca7aa Add block for WITH_PORTAUDIO2. 
Originally committed to SVN as r2789.
 2009-04-12 10:08:59 +00:00
Amar Takhar
72bfc9862a * s/$found_audio/$found_audio_player/ for clarity. 
* Add AM_CONDITIONAL for FOUND_AUDIO_PLAYER and FOUND_VIDEO_PROVIDER.

Originally committed to SVN as r2788.
 2009-04-12 10:08:28 +00:00
Amar Takhar
c674034054 Update PortAudio v19 support. 
Originally committed to SVN as r2787.
 2009-04-12 10:04:10 +00:00
Amar Takhar
2c3e71b098 Move the PortAudio v19 check above the v18 check. 
Originally committed to SVN as r2786.
 2009-04-11 23:40:15 +00:00
Amar Takhar
7ecdd1035a Add 'PortAudio2' as an audio player. 
Originally committed to SVN as r2785.
 2009-04-11 23:23:30 +00:00
Amar Takhar
ebdeeec267 Change WITH_PORTAUDIO -> WITH_PORTAUDIO2 
Originally committed to SVN as r2784.
 2009-04-11 23:18:04 +00:00
Amar Takhar
907484a602 Update audio_player_portaudio2.* for PortAudio v19. 
Originally committed to SVN as r2783.
 2009-04-11 23:16:58 +00:00
Amar Takhar
c12f35f9c6 Verbatium copy of audio_player_portaudio.* -> audio_player_portaudio2.* 
Originally committed to SVN as r2782.
 2009-04-11 23:15:45 +00:00
Fredrik Mellbin
6ca864b88c FFMS2 GCC compilation fix 
Originally committed to SVN as r2781.
 2009-04-11 19:43:18 +00:00
Fredrik Mellbin
cae545b1eb FFMS2 beta 6 (the real commit) 
Requires a recent FFmpeg
Changes the HAALITS define into HAALISOURCE

Originally committed to SVN as r2780.
 2009-04-11 18:45:40 +00:00
Amar Takhar
8631bd42e1 * Fix check for libavutil/pixfmt.h 
* Add detection for PortAudio2 (v19)

Originally committed to SVN as r2779.
 2009-04-11 18:06:23 +00:00
Amar Takhar
bf5146f937 Add a check for libavutil/pixfmt.h as a low-brow check for FFMPEG r18129+, this 
needs to be fixed to check exact versions of the library.  For now this should
work.

Originally committed to SVN as r2778.
 2009-04-11 08:13:09 +00:00
Amar Takhar
77a4983219 Fix an error message to be clearer. 
Originally committed to SVN as r2777.
 2009-04-11 07:51:50 +00:00
Amar Takhar
00339fefd0 Update libass to r29169 of MPlayer. 
Originally committed to SVN as r2776.
 2009-04-11 07:42:48 +00:00
Karl Blomster
ff1a4fb8fc Add a -v option to ffmsindex. 
Originally committed to SVN as r2775.
 2009-04-07 01:12:12 +00:00
Karl Blomster
eed309f187 Fix ffms2 video provider to work with new ffms2 version (b6) 
Originally committed to SVN as r2774.
 2009-04-06 20:53:01 +00:00
Karl Blomster
f80421d2e6 Updated ffms2.lib 
Originally committed to SVN as r2773.
 2009-04-06 20:19:33 +00:00
Karl Blomster
ac2c8bbed6 FFMS2 compile fix for ffmpeg revisions >18129. Probably breaks backwards compatibility so it doesn't compile with older revisions anymore, have fun. 
Originally committed to SVN as r2772.
 2009-04-06 20:15:49 +00:00
Karl Blomster
72cc224f5b Rename a few internal utility functions (FloatToString, IntegerToString, StringToInt, StringToFix) to Aegi* so they do not conflict with identically named wxWidgets functions. Fixes bugtracker issue #819. 
Originally committed to SVN as r2771.
 2009-04-06 20:01:42 +00:00
Karl Blomster
6bb861c7ef FFmpegSource2 beta 6, see ffms2.html for change details 
Originally committed to SVN as r2770.
 2009-04-06 19:14:55 +00:00
Karl Blomster
546f41e1a3 Add new (VSFilter 2.39) override tags to call tips and fix a typo. Patch by Harukalover. 
Originally committed to SVN as r2769.
 2009-03-30 22:10:24 +00:00
Karl Blomster
89c465dc71 FFmpegSource2 beta 5. 
Fixes a bug with timecode writing, adds some additional documentation and resolves the issue with reading ffmsindex's progress reporting from another program.

Originally committed to SVN as r2768.
 2009-03-30 22:09:33 +00:00
Rodrigo Braz Monteiro
261d9c21f1 Fixed windows project. 
Originally committed to SVN as r2766.
 2009-03-14 20:52:01 +00:00
Amar Takhar
c6e55826f5 * Add a (small) hack for scripts/osx-bundle.sh to handle libtools weirdness. 
* Update path to reflect new repo changes.

Originally committed to SVN as r2765.
 2009-03-13 04:27:24 +00:00
Amar Takhar
67af0c3661 Fix auto3 build after repo change. 
Originally committed to SVN as r2764.
 2009-03-13 04:13:11 +00:00
Amar Takhar
6f090f9027 Fix libass on OSX after the repo changes. 
Originally committed to SVN as r2763.
 2009-03-13 04:12:45 +00:00
Amar Takhar
4c02eb0984 Fix vs2008 build (Patch from Haruka) 
Originally committed to SVN as r2762.
 2009-03-12 05:56:02 +00:00
Amar Takhar
514624f83a Sync libass with r28935 from MPlayer. 
Originally committed to SVN as r2761.
 2009-03-12 03:46:44 +00:00
Amar Takhar
908e9381e8 Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3. 
Originally committed to SVN as r2760.
 2009-03-09 05:48:13 +00:00
Amar Takhar
3df8846bcb Remove dummy.txt it was used ages ago for testing the svn repository. 
Originally committed to SVN as r2759.
 2009-03-09 01:15:01 +00:00
Amar Takhar
d7e023e57f Update the build system for the new repository layout. 
Originally committed to SVN as r2757.
 2009-03-09 00:58:38 +00:00
Amar Takhar
0df92fa359 SVN Transition Step 4/7 
1. svn mv auto3 aegisub/src/libauto3
   1. svn mv installer aegisub/packages/win_installer

* See r2749 for full description.

Originally committed to SVN as r2753.
 2009-03-08 08:31:28 +00:00
Amar Takhar
a067bd560d SVN Transition Step 3/7 
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
 2009-03-08 08:30:39 +00:00
Amar Takhar
10a531b684 * Rework the debugging flags to set the variables conditionally on either being 
enabled.
* Fix some cut-and-paste-o's (dunno how I managed these)
* Move AC_SUBST* outside of the conditionally enabled blocks
* Fix typo.

Originally committed to SVN as r2746.
 2009-02-22 22:01:14 +00:00
Amar Takhar
eac9424b2a Add --enable-gcov, --enable-efence and --enable-ccmalloc for gcov, Electric 
Fence and ccmalloc support.  gcov support won't work without manual
intervention (for now) but some hooks will be added later to automate it.

Originally committed to SVN as r2745.
 2009-02-22 05:38:46 +00:00
Amar Takhar
68a9d536cb Return NULL if n < 0 on line 886, for whatever reason on FreeBSD this falls 
through exception handling and causes and abort().

Originally committed to SVN as r2743.
 2009-02-19 23:58:06 +00:00
Amar Takhar
ae6541cde4 Add audio_provider_dummy.cpp to the build which is required when _DEBUG is used. 
Originally committed to SVN as r2739.
 2009-02-17 08:12:19 +00:00
Amar Takhar
ea31698587 Add missing files from aegisub/libosxutil/, packages/, and scripts/. 
All of the missing files were related to OS X.

Originally committed to SVN as r2735.
 2009-02-16 00:27:52 +00:00
Niels Martin Hansen
342ab23e88 Oops, had a C++-style line comment in a C source file 
Originally committed to SVN as r2726.
 2009-02-09 18:10:16 +00:00
Niels Martin Hansen
fe2e4ba1e4 Updated version of stdint.h for MSVC 
Originally committed to SVN as r2725.
 2009-02-09 18:08:14 +00:00
Karl Blomster
f85ad3c81f Fix the jumpto dialog again. Now sets the max possible number of digits to input based on how many digits are in the final frame number. Patch by Harukalover, solves bugtracker issue #804. 
Originally committed to SVN as r2723.
 2009-02-05 14:48:19 +00:00
Karl Blomster
f530b4c0da Modified Harukalover's patch from yesterday so the frame number is sanitized after entry, not during. 
Originally committed to SVN as r2722.
 2009-02-04 23:22:10 +00:00
Karl Blomster
6a765528e1 Fix a bunch of edge cases in the VFR code. Patch by Plorkyeran, solves bugtracker issue #773. 
Originally committed to SVN as r2721.
 2009-02-04 23:11:56 +00:00
Karl Blomster
d9d0eddfde Minor cosmetic fixes to the goto frame/time dialog box. Patch by Harukalover. 
Originally committed to SVN as r2720.
 2009-02-04 01:45:43 +00:00
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