a2822356bf
Some more delayload vsprops files.
...
Originally committed to SVN as r2882.
2009-04-29 19:08:40 +00:00
1f062a5553
remove duplicate variable
...
Originally committed to SVN as r2881.
2009-04-29 17:42:48 +00:00
9c93aeb179
Fix a few memory leaks in the FFMS2 providers. Patch by Myrsloik.
...
Originally committed to SVN as r2880.
2009-04-29 17:40:02 +00:00
27e90e973f
FFMS2: Beta 7 release
...
Fix 3 gcc warnings
Originally committed to SVN as r2879.
2009-04-29 16:39:15 +00:00
8bc3a39d0c
Don't fail to read subtitles from MKV's that are named .mks or .mka, both of those are reported as supported formats in the "open subtitles" dialog box.
...
Originally committed to SVN as r2878.
2009-04-29 14:04:23 +00:00
29721b983e
s/32/??/ to include 64bit builds (what was I thinking?).. it's better than using '*' which could lead to a disaster.
...
Originally committed to SVN as r2877.
2009-04-29 08:07:22 +00:00
1fb14af113
Use 'SetFile' instead of '/usr/bin/SetFile' when creating the .dmg, 10.5 puts it in /usr/bin, on 10.4 it's in /Developer/Tools/.
...
Originally committed to SVN as r2876.
2009-04-29 07:55:40 +00:00
05af876c1d
* Favour '/usr/bin/perl' over 'perl' to ensure the base perl is always used. (it's required)
...
Originally committed to SVN as r2875.
2009-04-29 06:50:08 +00:00
02210e3669
* Re-format the arch detection case.
...
* Fix an annoying buy, I hate the loops configure gets stuck in when you do "$blah" = "$blah" vs test "$blah..
Originally committed to SVN as r2874.
2009-04-29 00:49:38 +00:00
d769707641
* Add support in configure.in to detect the arch.
...
* Add two new targets, osx-tinderbox-(bundle|dmg) to handle tinderbox building.
Originally committed to SVN as r2873.
2009-04-28 23:25:42 +00:00
3267c11fed
Change the buildslave dist name to dist.7z so the waterfall isn't cluttered. There's a link to the archive so it won't be an issue.
...
Originally committed to SVN as r2872.
2009-04-28 17:59:03 +00:00
876f726a6d
Don't try to synch audio when there is no audio player/provider present. (Could cause a crash under certain rare conditions.) Thanks Avi for report and fix.
...
Originally committed to SVN as r2871.
2009-04-28 10:23:20 +00:00
800e57897b
Add a batch file to generate a distfile that can be uploaded.
...
Originally committed to SVN as r2870.
2009-04-28 07:04:53 +00:00
9774fbb1c8
Remove an extra line (more testing.)
...
Originally committed to SVN as r2869.
2009-04-28 05:25:37 +00:00
77643ae596
Remove some EOF whitespace (more testing.)
...
Originally committed to SVN as r2868.
2009-04-28 05:24:28 +00:00
9079f1576f
Remove some EOF whitespace.
...
Originally committed to SVN as r2867.
2009-04-28 05:21:23 +00:00
8a13a78229
Add some error-checking and exit 1's.
...
Originally committed to SVN as r2866.
2009-04-28 05:17:33 +00:00
d929e60b4c
Add exit codes to various commands to ensure the script fails and doesn't proceed to the next step(s).
...
Originally committed to SVN as r2865.
2009-04-28 05:11:32 +00:00
501782d605
Testing the tinderbox (a stub commit but still useful.)
...
Originally committed to SVN as r2864.
2009-04-28 05:08:18 +00:00
bf99cbcd58
Testing the tinderbox.
...
Originally committed to SVN as r2863.
2009-04-27 20:58:42 +00:00
9444ebd0d1
Fix some more minor editbox regressions introduced in r2859. Patch by Harukalover, updates #794
...
Originally committed to SVN as r2861.
2009-04-26 04:31:19 +00:00
2ba20b12c8
Fix a minor graphical glitch in the time edit boxes introduced in r2859. Patch by Harukalover. updates #794
...
Originally committed to SVN as r2860.
2009-04-26 01:23:01 +00:00
fe05adb64e
Fix a number of odd quirks regarding how grid selection is moved after committing multiple lines, and how audio selection moves after committing. See #794 for full details. Patch by Harukalover.
...
closes #64 , #420 , #794
Originally committed to SVN as r2859.
2009-04-26 01:02:23 +00:00
c8908fd2d1
Fix a bug that would cause a crash under certain conditions when trying to change the properties of a recently deleted line. Patch by Plorkyeran, closes #815
...
Originally committed to SVN as r2858.
2009-04-26 00:25:33 +00:00
2d11cb6769
Fix a bug that would cause the program to crash if CSRI was selected as subtitle renderer but no CSRI renderer was actually installed. Patch by Plorkyeran, closes: 462
...
Originally committed to SVN as r2857.
2009-04-26 00:11:29 +00:00
78736ce617
Use less magic numbers
...
Originally committed to SVN as r2856.
2009-04-25 23:08:45 +00:00
8c5e380264
Update ffms2.lib
...
Originally committed to SVN as r2855.
2009-04-25 23:04:06 +00:00
8d11b72059
Sigh, add @set before the recently added environment variables (r2847)
...
Originally committed to SVN as r2854.
2009-04-25 23:00:29 +00:00
bc46304aa1
FFMS2: Another much needed set of fixes to the Haali part
...
Originally committed to SVN as r2853.
2009-04-25 22:09:49 +00:00
3655fbb7fa
Fix the video provider after the FFMS2 changes part2
...
Originally committed to SVN as r2852.
2009-04-25 10:31:39 +00:00
4c4df5f17a
Fix the video provider after the FFMS2 changes
...
Originally committed to SVN as r2851.
2009-04-25 09:26:03 +00:00
61d14a7b89
FFMS2: Even less enum forward declarations
...
Originally committed to SVN as r2850.
2009-04-25 09:09:14 +00:00
4e7bff9bd6
FFMS2: Less enum forward declaration?
...
Originally committed to SVN as r2849.
2009-04-25 08:55:14 +00:00
ac63f69e06
Add CommonProgramFiles CommonProgramFiles(x86) ProgramFiles ProgramFiles(x86) to the build environment.
...
Originally committed to SVN as r2847.
2009-04-25 02:04:33 +00:00
dbb192b01a
vc++ needs TMP/TEMP to be set in the env in order to work correctly.
...
Originally committed to SVN as r2846.
2009-04-24 23:23:48 +00:00
4b74827df6
FFMS2:
...
Remove the dependency of pixfmt.h in ffms.h
Added the alternative FFMS_GetPixFmt() for getting the different pixel format values
Originally committed to SVN as r2845.
2009-04-24 19:56:19 +00:00
518678b930
Update ffms2.lib again
...
Originally committed to SVN as r2844.
2009-04-24 18:41:34 +00:00
b8cf6fce8e
FFMS2:
...
Several bugfixes which should fix crashes in recent versions
Added a simple regression test application
Removed a few useless functions from the API
Add TheFluff's FFmpegSource 1.21 syntax compatibility script
Originally committed to SVN as r2843.
2009-04-24 17:42:21 +00:00
4777905b0a
Whoops, remove trunk\ from the solution path.
...
Originally committed to SVN as r2842.
2009-04-24 04:16:01 +00:00
80ce8b4d77
Add a bath file to compile aegisub, these will exist _per_ buildslave. It's probably better to keep it here anyway as build environments will not be changable without a historical record being kept. (it's also easier!)
...
Originally committed to SVN as r2841.
2009-04-24 04:00:04 +00:00
bcf82c0f9f
Add a solution and windows config for Windows tinderbox building. Submitted by jfs, thanks!
...
Originally committed to SVN as r2840.
2009-04-23 20:26:07 +00:00
b97bbf9792
Updated German translation (by Sebastian Billau).
...
Originally committed to SVN as r2839.
2009-04-23 10:32:00 +00:00
22faf80cdb
Avisynth video provider will now use ffmpegsource2 instead of ffmpegsource when so required.
...
Originally committed to SVN as r2838.
2009-04-23 02:09:05 +00:00
bd0f1dcd10
FFMS2: Various fixes to haali stuff
...
Originally committed to SVN as r2837.
2009-04-22 18:38:28 +00:00
71c29969a3
Add a cross-compile condition to AC_RUN_IFELSE in AC_AGI_COMPILE to make cross-compiling work.
...
Originally committed to SVN as r2836.
2009-04-21 22:32:07 +00:00
09d32d8151
Bunk commit to trigger the build cluster.
...
Originally committed to SVN as r2835.
2009-04-21 18:48:59 +00:00
1118dcac4a
Add a command to autogen --skip-configure to allow the autogen/configure steps
...
to be split for the build tinderbox.
Originally committed to SVN as r2834.
2009-04-20 02:45:35 +00:00
f5124e7763
Fix typo.
...
Originally committed to SVN as r2833.
2009-04-20 02:43:32 +00:00
e8d1767428
Remove outdated and unused Windows installer scripts.
...
Originally committed to SVN as r2832.
2009-04-19 20:48:08 +00:00
b842a3ea76
Remove the annoyance known as Tip of the Day. Right now it's completely inaccessible, but might return in a different incarnation when we get out of strings freeze.
...
Originally committed to SVN as r2831.
2009-04-18 15:29:13 +00:00
58ec137621
Simplify code to pick mapping size in PCMWAV provider, just use sizeof(void*) to determine address space size.
...
Originally committed to SVN as r2830.
2009-04-18 15:16:15 +00:00
5a50efac9f
Move more project settings into property sheet files.
...
Originally committed to SVN as r2829.
2009-04-18 13:40:52 +00:00
30422e5ca8
Rename auto3 DLL to something less ugly.
...
Originally committed to SVN as r2828.
2009-04-18 13:31:08 +00:00
254a7ae359
revert revision 2825 since apparently it broke all of jfs' changes
...
Originally committed to SVN as r2827.
2009-04-18 13:02:13 +00:00
c806ba8d72
"Fix" an issue that would cause the FFMS2 audio provider to crash when fed with a unicode filename/path. The solution involves getting the "short path", no idea if it works on Unix. Fixes bugtracker issues #810 and #808 .
...
Originally committed to SVN as r2826.
2009-04-18 10:54:20 +00:00
3e70c0af81
add portaudio_x86.dll to the list of delay-loaded dll's in the vs2008 project file
...
Originally committed to SVN as r2825.
2009-04-18 09:37:54 +00:00
f12a3a8af7
Fix an issue where the grid font face option's font browser button wouldn't actually update the setting. Patch by Harukalover, resolves bugtracker issues #706 and (partially) #821 .
...
Originally committed to SVN as r2824.
2009-04-18 09:12:26 +00:00
4fc3b7faf0
No longer support anything for Windows-builds but Visual Studio 2008/VC9.
...
Remove all outdated, unmaintained project files and some unused dirs, and other stuff related to outdated build methods.
Originally committed to SVN as r2821.
2009-04-17 22:08:37 +00:00
af538651ef
Some changes to property sheets went unsaved before previous commit, oops.
...
(This made linking in various things impossible.)
Originally committed to SVN as r2820.
2009-04-17 21:58:17 +00:00
2c392407c4
Refactor Visual Studio 2008 build and make libauto3 and Lua 5.0 build on VC9.
...
* The most important project properties (especially paths) are now stored in VSProps files in generalised ways.
* Projects share VSProps files so they place output files in same locations and thus agree on where to find them.
* Avoid inconsistencies between build configurations/platforms as has happened often before.
* Now distributable binaries (aegisub.exe and aegisub-auto3.dll) will be placed in $(SolutionDir)/bin/, static libraries under $(SolutionDir)/lib/ and object files etc. under $(SolutionDir)/build/. Note that those locations are controlled by where the solution file is placed in the file system.
* libauto3 is no longer pulled in by a #pragma in auto4_auto3.c, but must instead be pulled in by making the aegisub project depend on the auto3 project, which must in turn depend on the lua50 project.
* Final binary filenames are now somewhat different. You get aegisub32.exe, aegisub64d.exe, aegisub-auto3lib32d.dll and more.
* There's still more that can be factored out, things like optimisation flags and defines.
Originally committed to SVN as r2819.
2009-04-17 21:53:48 +00:00
6d1207900b
The lines.n value produced by Auto3 implementation was 1 too small causing the last line in a file to be eaten by karaskel.
...
Originally committed to SVN as r2818.
2009-04-17 21:34:43 +00:00
a3600f8ca1
Make callables.c error properly if it's attempted compiled separately.
...
Originally committed to SVN as r2817.
2009-04-17 20:55:48 +00:00
2d64f5079f
Make libauto3 better liked by MSVC 2008.
...
Originally committed to SVN as r2816.
2009-04-17 20:51:58 +00:00
59eb07c79f
add portaudio2 player to the vs2005 project as well while I'm at it
...
Originally committed to SVN as r2814.
2009-04-17 19:45:33 +00:00
80ce8e7508
add portaudio2 audio player to config/config_windows0.h and the vs2008 project file
...
Originally committed to SVN as r2813.
2009-04-17 19:44:07 +00:00
6a69da3331
change buffer length/wanted latency in the dsound2 audio player to 80/4 (down from 100/5); should make it a bit more responsive
...
Originally committed to SVN as r2812.
2009-04-17 19:40:29 +00:00
13c59b5af0
update ffms2.lib
...
Originally committed to SVN as r2811.
2009-04-17 19:38:12 +00:00
19b5544a2a
Fix crash in PCM audio provider when using files larger than the mapping size (256 MB on 32 bit). The length of mappings closer than mapping-size to the end of the file, when the file was larger, would not be adjusted to not cross the end of file.
...
Originally committed to SVN as r2810.
2009-04-17 16:34:06 +00:00
28470e309d
Re-order the functions so they're in line with every other player: Constructor,
...
Destructor, Open, Close, Play, Stop.. I rue the fact that I didn't do this at
the start.
Originally committed to SVN as r2809.
2009-04-17 13:58:44 +00:00
0ad0b6d5c9
Fix a bug in FFMS2 that caused it to write timecodes with scientific notation.
...
Originally committed to SVN as r2808.
2009-04-17 03:25:10 +00:00
235af35603
* Remove a short-lived hack (hours?) and replace it with a
...
PaStreamFinishedCallback which is called anytime a PaCallback is exited with
anything other than 0. (normal operation) paStreamFinishedCallback handles
stopping the audio stream when we've run to the end of the current selection
or the stream is stopped.
* Add framesPerBuffer to paCallback debug output in preperation for dynamic
buffers.
* Set paPrimeOutputBuffersUsingStreamCallback in Pa_OpenStream to prime the
output buffer using the callback rather than initing with empty space which
is the default.
* Indent paCallback decleration another level.
Originally committed to SVN as r2807.
2009-04-17 02:14:42 +00:00
a3f9735d38
* Fold entire callback into a single if-else block.
...
* Remove 'end' variable and just return 0 if we have more to play.
Originally committed to SVN as r2806.
2009-04-16 20:55:14 +00:00
0d7af5f333
* Remove variable 'avail'.
...
* Fold lenAvailable logic into a ternary operator.
* Use GetAduioWithVolume instead of applying volume ourselves.
* Remove code used to zero rest of the buffer. (not required)
Originally committed to SVN as r2805.
2009-04-16 20:49:37 +00:00
89fa60082e
* Set Pa_OpenStream to use paClipOff as we don't need any clipping
...
* Update comment (realPlayPos has been removed).
* Return from paCallback with paAbort if there is no more audio to play.
Also set endPos to be less than the current playPos to stop the audio
event timer.
* Add CPU usage statistics to debug printf in paCallback.
Originally committed to SVN as r2804.
2009-04-16 19:55:52 +00:00
eebde56363
Make debug printf's a perm fixture wrapped with PORTAUDIO2_DEBUG.
...
Originally committed to SVN as r2803.
2009-04-16 14:22:46 +00:00
bcc8cede88
Forgot to put license on VideoSink.h as well.
...
Originally committed to SVN as r2802.
2009-04-16 13:01:05 +00:00
103c407a64
Clarify license for VideoSink.cpp.
...
<jfs> hmm Haali, the VideoSink.cpp you have contributed to aegisub doesn't have a license attached... I see you put MatroskaParser.c into 3-clause BSD like the rest of aegisub though, what about VideoSink ?
<Haali> jfs: BSD license is ok for that file
Originally committed to SVN as r2801.
2009-04-16 12:15:57 +00:00
fd16c4ff13
Move the comment for the PortAudio library to setup.cpp.
...
Requested by: TheFluff
Originally committed to SVN as r2800.
2009-04-15 20:16:54 +00:00
d689a486c0
Don't initalise favorite to 0 (it's a a wxString).
...
Originally committed to SVN as r2799.
2009-04-15 20:11:53 +00:00
96a33b1331
Don't set the current position via the PortAudio callback, instead set
...
GetCurrentPosition() to return the correct value using Pa_GetStreamTime(). Not
only does it not work on every platform, there is no point in setting it during
the callback as GetCurrentPosition() isn't called very often (in comparison)
when updating the play bar. Eventually this should be changed to update the
playbar via a callback to get a position that's a lot more accurate.
Originally committed to SVN as r2798.
2009-04-15 17:50:16 +00:00
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
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
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
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
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
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
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
11c341030b
Add support for ALSA_(LD|C)FLAGS.
...
Originally committed to SVN as r2790.
2009-04-12 10:28:42 +00:00
f6d8cca7aa
Add block for WITH_PORTAUDIO2.
...
Originally committed to SVN as r2789.
2009-04-12 10:08:59 +00:00
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
c674034054
Update PortAudio v19 support.
...
Originally committed to SVN as r2787.
2009-04-12 10:04:10 +00:00
2c3e71b098
Move the PortAudio v19 check above the v18 check.
...
Originally committed to SVN as r2786.
2009-04-11 23:40:15 +00:00
7ecdd1035a
Add 'PortAudio2' as an audio player.
...
Originally committed to SVN as r2785.
2009-04-11 23:23:30 +00:00
ebdeeec267
Change WITH_PORTAUDIO -> WITH_PORTAUDIO2
...
Originally committed to SVN as r2784.
2009-04-11 23:18:04 +00:00
907484a602
Update audio_player_portaudio2.* for PortAudio v19.
...
Originally committed to SVN as r2783.
2009-04-11 23:16:58 +00:00
c12f35f9c6
Verbatium copy of audio_player_portaudio.* -> audio_player_portaudio2.*
...
Originally committed to SVN as r2782.
2009-04-11 23:15:45 +00:00
6ca864b88c
FFMS2 GCC compilation fix
...
Originally committed to SVN as r2781.
2009-04-11 19:43:18 +00:00
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
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
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
Niels Martin Hansen