[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/engine AudioChannel.h CoreAudioDri...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/engine AudioChannel.h CoreAudioDri... |
Date: |
Mon, 24 Nov 2008 21:11:04 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/11/24 21:11:04
Modified files:
src/engine : AudioChannel.h CoreAudioDriver.cpp
Log message:
* more compile fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioChannel.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/CoreAudioDriver.cpp?cvsroot=traverso&r1=1.5&r2=1.6
Patches:
Index: AudioChannel.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioChannel.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AudioChannel.h 18 Feb 2008 08:17:30 -0000 1.7
+++ AudioChannel.h 24 Nov 2008 21:11:04 -0000 1.8
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioChannel.h,v 1.7 2008/02/18 08:17:30 r_sijrier Exp $
+$Id: AudioChannel.h,v 1.8 2008/11/24 21:11:04 r_sijrier Exp $
*/
#ifndef AUDIOCHANNEL_H
@@ -97,6 +97,7 @@
friend class PADriver;
friend class PulseAudioDriver;
friend class Driver;
+ friend class CoreAudioDriver;
int has_data()
{
Index: CoreAudioDriver.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/CoreAudioDriver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CoreAudioDriver.cpp 24 Nov 2008 19:41:37 -0000 1.5
+++ CoreAudioDriver.cpp 24 Nov 2008 21:11:04 -0000 1.6
@@ -339,6 +339,7 @@
}
} else {
// TODO find out if ioData->mBuffers[i] correspond with the
playbackChannels indices
+ audio_sample_t* buf;
for (int i=0; i<playbackChannels.size(); ++i) {
AudioChannel* channel = playbackChannels.at(i);
if (!channel->has_data()) {
@@ -410,11 +411,14 @@
UInt32 outSize = sizeof(Float64);
Float64 sampleRate;
AudioStreamBasicDescription srcFormat, dstFormat;
- OSStatus err = AudioDeviceGetProperty(device_id, 0,
kAudioDeviceSectionGlobal, kAudioDevicePropertyNominalSampleRate, &outSize,
&sampleRate);
+
+ // FIXME kAudioDeviceSectionGlobal not declared
compile error ?
+ OSStatus err;
+/* OSStatus err = AudioDeviceGetProperty(device_id, 0,
kAudioDeviceSectionGlobal, kAudioDevicePropertyNominalSampleRate, &outSize,
&sampleRate);
if (err != noErr) {
PERROR("Cannot get current sample rate");
return kAudioHardwareUnsupportedOperationError;
- }
+ }*/
JCALog("JackCoreAudioDriver::NotificationCallback
kAudioDevicePropertyNominalSampleRate %ld\n", (long)sampleRate);
outSize = sizeof(AudioStreamBasicDescription);
@@ -454,25 +458,25 @@
-static OSStatus CoreAudioDriver::_render(void * inRefCon,
AudioUnitRenderActionFlags * ioActionFlags, const AudioTimeStamp * inTimeStamp,
UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList * ioData)
+static OSStatus _render(void * inRefCon, AudioUnitRenderActionFlags *
ioActionFlags, const AudioTimeStamp * inTimeStamp, UInt32 inBusNumber, UInt32
inNumberFrames, AudioBufferList * ioData)
{
CoreAudioDriver* driver = (CoreAudioDriver*)inRefCon;
return driver->render(ioActionFlags, inTimeStamp, inBusNumber,
inNumberFrames, ioData);
}
-static OSStatus CoreAudioDriver::_render_input(void * inRefCon,
AudioUnitRenderActionFlags * ioActionFlags, const AudioTimeStamp * inTimeStamp,
UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList * ioData)
+static OSStatus _render_input(void * inRefCon, AudioUnitRenderActionFlags *
ioActionFlags, const AudioTimeStamp * inTimeStamp, UInt32 inBusNumber, UInt32
inNumberFrames, AudioBufferList * ioData)
{
CoreAudioDriver* driver = (CoreAudioDriver*)inRefCon;
return driver->render_input(ioActionFlags, inTimeStamp, inBusNumber,
inNumberFrames, ioData);
}
-static OSStatus CoreAudioDriver::_sr_notification(AudioDeviceID inDevice,
UInt32 inChannel, Boolean isInput, AudioDevicePropertyID inPropertyID, void *
inClientData)
+static OSStatus _sr_notification(AudioDeviceID inDevice, UInt32 inChannel,
Boolean isInput, AudioDevicePropertyID inPropertyID, void * inClientData)
{
CoreAudioDriver* driver = (CoreAudioDriver*)inClientData;
return driver->sr_notification(inDevice, inChannel, isInput,
inPropertyID);
}
-static OSStatus CoreAudioDriver::_notification(AudioDeviceID inDevice, UInt32
inChannel, Boolean isInput, AudioDevicePropertyID inPropertyID, void *
inClientData)
+static OSStatus _notification(AudioDeviceID inDevice, UInt32 inChannel,
Boolean isInput, AudioDevicePropertyID inPropertyID, void * inClientData)
{
CoreAudioDriver* driver = (CoreAudioDriver*)inClientData;
return driver->notification(inDevice, inChannel, isInput, inPropertyID);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/engine AudioChannel.h CoreAudioDri...,
Remon Sijrier <=