[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/engine PADriver.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/engine PADriver.cpp |
Date: |
Thu, 25 Oct 2007 15:42:07 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/10/25 15:42:07
Modified files:
src/engine : PADriver.cpp
Log message:
* Use AudioDevice message passing system instead of using class
Information. (Thanks Ben for reminding me for this one :) )
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/PADriver.cpp?cvsroot=traverso&r1=1.6&r2=1.7
Patches:
Index: PADriver.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/PADriver.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PADriver.cpp 6 May 2007 13:29:40 -0000 1.6
+++ PADriver.cpp 25 Oct 2007 15:42:07 -0000 1.7
@@ -24,7 +24,6 @@
#include "AudioDevice.h"
#include "AudioChannel.h"
-#include <Information.h>
#include <Utils.h>
// Always put me below _all_ includes, this is needed
@@ -127,7 +126,7 @@
PaError err = Pa_Initialize();
if( err != paNoError ) {
- info().warning(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )) );
+ device->message(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )), AudioDevice::WARNING);
Pa_Terminate();
return -1;
} else {
@@ -141,7 +140,7 @@
for (int i=0; i<Pa_GetHostApiCount(); ++i) {
const PaHostApiInfo* inf = Pa_GetHostApiInfo(i);
-// info().warning(tr("hostapi name is %1, deviceCount is
%2").arg(inf->name).arg(inf->deviceCount));
+// device->message(tr("hostapi name is %1, deviceCount is
%2").arg(inf->name).arg(inf->deviceCount), AudioDevice::INFO);
if (hostapi == "alsa" && inf->type == paALSA) {
printf("PADriver:: Found alsa host api, using device
%d\n", i);
@@ -176,12 +175,12 @@
if (deviceindex == -1) {
- info().warning(tr("PADriver:: hostapi %1 was not found by
Portaudio!").arg(hostapi));
+ device->message(tr("PADriver:: hostapi %1 was not found by
Portaudio!").arg(hostapi), AudioDevice::WARNING);
return -1;
}
deviceindex = 0;
-// info().information(tr("PADriver:: using device %1").arg(deviceindex));
+// device->message(tr("PADriver:: using device %1").arg(deviceindex),
AudioDevice::INFO);
// Configure output parameters.
// TODO get the max channel count, and use that instead, of assuming 2
@@ -215,7 +214,7 @@
this );
if( err != paNoError ) {
- info().warning(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )) );
+ device->message(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )), AudioDevice::WARNING);
Pa_Terminate();
return -1;
} else {
@@ -261,7 +260,7 @@
PaError err = Pa_StartStream( m_paStream );
if( err != paNoError ) {
- info().warning(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )) );
+ device->message((tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err ))), AudioDevice::WARNING);
Pa_Terminate();
return -1;
} else {
@@ -277,7 +276,7 @@
PaError err = Pa_CloseStream( m_paStream );
if( err != paNoError ) {
- info().warning(tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err )) );
+ device->message((tr("PADriver:: PortAudio error:
%1").arg(Pa_GetErrorText( err ))), AudioDevice::WARNING);
Pa_Terminate();
} else {
printf("PADriver:: Succesfully closed portaudio stream\n\n");
@@ -316,6 +315,7 @@
void PADriver::_on_pa_shutdown_callback(void * arg)
{
+ Q_UNUSED(arg);
}
int PADriver::_process_callback(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/engine PADriver.cpp,
Remon Sijrier <=