Commit graph

1273 commits

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