50ce42d2e9
* 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
eb65009f66
* 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
c6364bf43d
* 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
3e864d10c9
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
7271a74b54
Forgot to put license on VideoSink.h as well.
...
Originally committed to SVN as r2802.
2009-04-16 13:01:05 +00:00
4da7a70608
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
50214a2a6a
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
50b7f33117
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
918945e03b
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
b63c2ea27c
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
aa85b2eb01
* 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
558be555e2
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
2d6ba0cb22
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
733814793e
* 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
8dab71e974
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
21460ec589
Add block for WITH_PORTAUDIO2.
...
Originally committed to SVN as r2789.
2009-04-12 10:08:59 +00:00
97c857a94f
Add 'PortAudio2' as an audio player.
...
Originally committed to SVN as r2785.
2009-04-11 23:23:30 +00:00
3247ad6c6c
Change WITH_PORTAUDIO -> WITH_PORTAUDIO2
...
Originally committed to SVN as r2784.
2009-04-11 23:18:04 +00:00
e61d0b77ac
Update audio_player_portaudio2.* for PortAudio v19.
...
Originally committed to SVN as r2783.
2009-04-11 23:16:58 +00:00
23eea68fdd
Verbatium copy of audio_player_portaudio.* -> audio_player_portaudio2.*
...
Originally committed to SVN as r2782.
2009-04-11 23:15:45 +00:00
2960b0298c
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
036da35fe8
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
1d69da533c
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
6106546f74
Fixed windows project.
...
Originally committed to SVN as r2766.
2009-03-14 20:52:01 +00:00
2cf7d9c80b
Fix auto3 build after repo change.
...
Originally committed to SVN as r2764.
2009-03-13 04:13:11 +00:00
a9180cfcf7
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
99d2711245
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
91d73ec8ea
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