[SCM] stk/master: Prepare for new rtaudio and rtmidi
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Mon Jun 9 23:01:29 UTC 2014
The following commit has been merged in the master branch:
commit 648956343cb66bbedbcfea92791415217944ea13
Author: Felipe Sateler <fsateler at debian.org>
Date: Mon Jun 9 17:37:09 2014 -0400
Prepare for new rtaudio and rtmidi
diff --git a/debian/control b/debian/control
index d3edc06..674ad00 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends:
libasound2-dev [linux-any],
libjack-dev [linux-any],
libreadline-dev,
- librtaudio-dev (>= 4.0.11~) [linux-any],
- librtmidi-dev (>= 2.0.1~) [linux-any]
+ librtaudio-dev (>= 4.1.1~ds0~) [linux-any],
+ librtmidi-dev (>= 2.1.0~) [linux-any]
Standards-Version: 3.9.4
Homepage: http://ccrma.stanford.edu/software/stk/
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/stk.git
diff --git a/debian/patches/06-new-rtaudio-rtmidi.patch b/debian/patches/06-new-rtaudio-rtmidi.patch
new file mode 100644
index 0000000..7c3f508
--- /dev/null
+++ b/debian/patches/06-new-rtaudio-rtmidi.patch
@@ -0,0 +1,410 @@
+--- a/projects/demo/demo.cpp
++++ b/projects/demo/demo.cpp
+@@ -262,7 +262,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -282,7 +282,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -307,7 +307,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ }
+ }
+--- a/projects/effects/effects.cpp
++++ b/projects/effects/effects.cpp
+@@ -256,7 +256,7 @@ int main( int argc, char *argv[] )
+ try {
+ adac.openStream( &oparameters, &iparameters, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -270,7 +270,7 @@ int main( int argc, char *argv[] )
+ try {
+ adac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -285,7 +285,7 @@ int main( int argc, char *argv[] )
+ try {
+ adac.closeStream();
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ }
+
+--- a/projects/eguitar/eguitar.cpp
++++ b/projects/eguitar/eguitar.cpp
+@@ -302,7 +302,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -338,7 +338,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -363,7 +363,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ }
+ }
+--- a/projects/examples/bethree.cpp
++++ b/projects/examples/bethree.cpp
+@@ -59,7 +59,7 @@ int main()
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -78,7 +78,7 @@ int main()
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -91,7 +91,7 @@ int main()
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/examples/controlbee.cpp
++++ b/projects/examples/controlbee.cpp
+@@ -133,7 +133,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -152,7 +152,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -165,7 +165,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/examples/crtsine.cpp
++++ b/projects/examples/crtsine.cpp
+@@ -36,7 +36,7 @@ int main()
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&sine );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -46,7 +46,7 @@ int main()
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -60,7 +60,7 @@ int main()
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/examples/duplex.cpp
++++ b/projects/examples/duplex.cpp
+@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
+ try {
+ adac.openStream( &oParams, &iParams, FORMAT, fs, &bufferFrames, &inout, (void *)&bufferBytes, &options );
+ }
+- catch ( RtError& e ) {
++ catch ( RtAudioError& e ) {
+ std::cout << '\n' << e.getMessage() << '\n' << std::endl;
+ exit( 1 );
+ }
+@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
+ // Stop the stream.
+ adac.stopStream();
+ }
+- catch ( RtError& e ) {
++ catch ( RtAudioError& e ) {
+ std::cout << '\n' << e.getMessage() << '\n' << std::endl;
+ goto cleanup;
+ }
+--- a/projects/examples/grains.cpp
++++ b/projects/examples/grains.cpp
+@@ -82,7 +82,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&grani );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -90,7 +90,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -105,7 +105,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/examples/midiprobe.cpp
++++ b/projects/examples/midiprobe.cpp
+@@ -17,7 +17,7 @@ int main()
+ try {
+ midiin = new RtMidiIn();
+ }
+- catch ( RtError &error ) {
++ catch ( RtMidiError &error ) {
+ error.printMessage();
+ exit( EXIT_FAILURE );
+ }
+@@ -31,7 +31,7 @@ int main()
+ try {
+ portName = midiin->getPortName(i);
+ }
+- catch ( RtError &error ) {
++ catch ( RtMidiError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -42,7 +42,7 @@ int main()
+ try {
+ midiout = new RtMidiOut();
+ }
+- catch ( RtError &error ) {
++ catch ( RtMidiError &error ) {
+ error.printMessage();
+ exit( EXIT_FAILURE );
+ }
+@@ -54,7 +54,7 @@ int main()
+ try {
+ portName = midiout->getPortName(i);
+ }
+- catch ( RtError &error ) {
++ catch ( RtMidiError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+--- a/projects/examples/play.cpp
++++ b/projects/examples/play.cpp
+@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&input );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/examples/playsmf.cpp
++++ b/projects/examples/playsmf.cpp
+@@ -36,7 +36,7 @@ int main( int argc, char *argv[] )
+ try {
+ midiout = new RtMidiOut();
+ }
+- catch ( RtError& error ) {
++ catch ( RtMidiError& error ) {
+ error.printMessage();
+ exit(0);
+ }
+@@ -48,7 +48,7 @@ int main( int argc, char *argv[] )
+ try {
+ midiout->openVirtualPort();
+ }
+- catch ( RtError& error ) {
++ catch ( RtMidiError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -62,7 +62,7 @@ int main( int argc, char *argv[] )
+ try {
+ midiout->openPort( port );
+ }
+- catch ( RtError& error ) {
++ catch ( RtMidiError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+--- a/projects/examples/threebees.cpp
++++ b/projects/examples/threebees.cpp
+@@ -133,7 +133,7 @@ int main()
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -157,7 +157,7 @@ int main()
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -170,7 +170,7 @@ int main()
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ }
+
+--- a/projects/ragamatic/ragamat.cpp
++++ b/projects/ragamatic/ragamat.cpp
+@@ -294,7 +294,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -317,7 +317,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.startStream();
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ error.printMessage();
+ goto cleanup;
+ }
+@@ -332,7 +332,7 @@ int main( int argc, char *argv[] )
+ try {
+ dac.closeStream();
+ }
+- catch ( RtError& error ) {
++ catch ( RtAudioError& error ) {
+ error.printMessage();
+ }
+
+--- a/src/Messager.cpp
++++ b/src/Messager.cpp
+@@ -254,7 +254,7 @@ bool Messager :: startMidiInput( int por
+ if ( port == -1 ) data_.midi->openVirtualPort();
+ else data_.midi->openPort( (unsigned int)port );
+ }
+- catch ( RtError &error ) {
++ catch ( RtMidiError &error ) {
+ oStream_ << "Messager::startMidiInput: error creating RtMidiIn instance (" << error.getMessage() << ").";
+ handleError( StkError::WARNING );
+ return false;
+--- a/src/RtWvIn.cpp
++++ b/src/RtWvIn.cpp
+@@ -86,7 +86,7 @@ RtWvIn :: RtWvIn( unsigned int nChannels
+ try {
+ adc_.openStream( NULL, ¶meters, format, (unsigned int)Stk::sampleRate(), &size, &read, (void *)this );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ handleError( error.what(), StkError::AUDIO_SYSTEM );
+ }
+
+--- a/src/RtWvOut.cpp
++++ b/src/RtWvOut.cpp
+@@ -107,7 +107,7 @@ RtWvOut :: RtWvOut( unsigned int nChanne
+ try {
+ dac_.openStream( ¶meters, NULL, format, (unsigned int)Stk::sampleRate(), &size, &write, (void *)this );
+ }
+- catch ( RtError &error ) {
++ catch ( RtAudioError &error ) {
+ handleError( error.what(), StkError::AUDIO_SYSTEM );
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 43d33cf..8fa49d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03-system_rtaudio_rtmidi.patch
04-build-shared.patch
05-endian.h.patch
+06-new-rtaudio-rtmidi.patch
--
stk packaging
More information about the pkg-multimedia-commits
mailing list