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
e977f3c991
Force use of ANSI versions of Windows API's for runtime+loading of DLL's, causing problems when building with UNICODE defined.
...
Originally committed to SVN as r2815.
2009-04-17 20:20:37 +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
77a4983219
Fix an error message to be clearer.
...
Originally committed to SVN as r2777.
2009-04-11 07:51:50 +00:00
00339fefd0
Update libass to r29169 of MPlayer.
...
Originally committed to SVN as r2776.
2009-04-11 07:42:48 +00:00
ff1a4fb8fc
Add a -v option to ffmsindex.
...
Originally committed to SVN as r2775.
2009-04-07 01:12:12 +00:00
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
f80421d2e6
Updated ffms2.lib
...
Originally committed to SVN as r2773.
2009-04-06 20:19:33 +00:00
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
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
6bb861c7ef
FFmpegSource2 beta 6, see ffms2.html for change details
...
Originally committed to SVN as r2770.
2009-04-06 19:14:55 +00:00
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
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
Niels Martin Hansen