Changeset 8803

Timestamp:

02/26/09 10:50:41 (4 years ago)

Author:

jgaeddert

Message:

fleshing out AudioDevice? functionality

Location:

ossiedev/branches/0.7.x/platform/AudioDevice/src

Files:

• AudioDevice.cpp (modified) (5 diffs)
• AudioDevice.h (modified) (3 diffs)

ossiedev/branches/0.7.x/platform/AudioDevice/src/AudioDevice.cpp

@@ -1 +1 @@
 /**************************************************************************** 
+
 Copyright 2009 Virginia Polytechnic Institute and State University
 
@@ -20 +21 @@
 ****************************************************************************/
 
-/** \file
-    The soundCardCapture.cpp file contains definitions for the AudioDevice_i
-    class implementation.
-*/
-
 #include <iostream>
 #include "AudioDevice.h"
 
-#define AUDIODEVICE_PROPID_SAMPLERATECAPTURE    "DCE:xxx:0"
+#define AUDIODEVICE_PROPID_SAMPLERATERECORD     "DCE:xxx:0"
 #define AUDIODEVICE_PROPID_SAMPLERATEPLAYBACK   "DCE:xxx:1"
-#define AUDIODEVICE_PROPID_BUFFERSIZECAPTURE    "DCE:xxx:2"
+#define AUDIODEVICE_PROPID_BUFFERSIZERECORD     "DCE:xxx:2"
 #define AUDIODEVICE_PROPID_BUFFERSIZEPLAYBACK   "DCE:xxx:3"
 
 // Initializing constructor
 AudioDevice_i::AudioDevice_i(char *uuid, char *label, char *profile, omni_condition *condition) 
-  : Device_impl(uuid, label, profile), component_running(condition), isRunning(false)
+  : Device_impl(uuid, label, profile),
+    component_running(condition),
+    isRunning(false)
 {
     DEBUG(3, AudioDevice, "constructor invoked")
@@ -89 +87 @@
 
     if (!CORBA::is_nil(u))
-    return u._retn();
+        return u._retn();
 
-    /// Port name not found; throw exception
+    // Port name not found; throw exception
     throw CF::PortSupplier::UnknownPort();
-
 }
 
 void AudioDevice_i::initialize() 
 throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
-
 {
     DEBUG(3, AudioDevice, "initialize() invoked")
-
-
-    DEBUG(1, AudioDevice, "Initialize (capture) exit")
 }
 
@@ -116 +109 @@
 
     // read properties from .prf
-    unsigned int rate(16000); // default sampling rate
     
+    CORBA::Short n;
     for (unsigned int i=0; i<props.length(); i++)
     {
         DEBUG(3, AudioDevice, "configure property id : " << props[i].id)
 
-        if (strcmp(props[i].id, AUDIODEVICE_PROPID_SAMPLERATECAPTURE)==0)
-        {
-            CORBA::Short n;
+        if (strcmp(props[i].id, AUDIODEVICE_PROPID_SAMPLERATERECORD)==0) {
+            // sample rate: record
             props[i].value >>= n;
-            rate = n;
-            DEBUG(3, AudioDevice, "sample rate: " << rate << " Hz")
-        }
-        else
-        {
-            DEBUG(1, AudioDevice, "ERROR: unkown configure() property id " << props[i].id)
+            samplerate_record = n;
+            DEBUG(3, AudioDevice, "sample rate (record): " << samplerate_record << " Hz")
+        } else if (strcmp(props[i].id, AUDIODEVICE_PROPID_SAMPLERATEPLAYBACK)==0) {
+            // sample rate: playback
+            props[i].value >>= n;
+            samplerate_playback = n;
+            DEBUG(3, AudioDevice, "sample rate (playback): " << samplerate_playback << " Hz")
+        } else if (strcmp(props[i].id, AUDIODEVICE_PROPID_BUFFERSIZERECORD)==0) {
+            // buffer size: record
+            props[i].value >>= n;
+            buffersize_record = n;
+            DEBUG(3, AudioDevice, "buffer size (record): " << buffersize_record)
+        } else if (strcmp(props[i].id, AUDIODEVICE_PROPID_BUFFERSIZEPLAYBACK)==0) {
+            // buffer size: playback
+            props[i].value >>= n;
+            buffersize_playback = n;
+            DEBUG(3, AudioDevice, "buffer size (playback): " << buffersize_playback)
+        } else {
+            std::cerr << "ERROR AudioDevice_i::configure(): unkown property id "
+                      << props[i].id << std::endl;
             throw(CF::PropertySet::InvalidConfiguration());
         }
@@ -151 +157 @@
     PortTypes::ShortSequence L_out, R_out;
 
-    const int buf_size = 512;
-    
-    short buf[buf_size]; 
-
-    int buf_length = buf_size / 2;
-
-    L_out.length(buf_length);
-    R_out.length(buf_length);
+    L_out.length(1);
+    R_out.length(1);
    
-    int rc;
-
     while(1)
     {

ossiedev/branches/0.7.x/platform/AudioDevice/src/AudioDevice.h

@@ -22 +22 @@
 ****************************************************************************/
 
-/** \file 
-    The Sound_out.h file contains declarations for the SoundCardPlayback_i
-    class.
-*/
-
-
-
 #ifndef __OSSIE_AUDIO_DEVICE_H__
 #define __OSSIE_AUDIO_DEVICE_H__
@@ -41 +34 @@
 #include "standardinterfaces/complexShort.h"
 #include "standardinterfaces/complexShort_u.h"
+
+#include "portaudio.h"
+
+static int portaudio_playback_callback(
+    const void *inputBuffer,
+    void *outputBuffer,
+    unsigned long framesPerBuffer,
+    const PaStreamCallbackTimeInfo* timeInfo,
+    PaStreamCallbackFlags statusFlags,
+    void *userData );
+
+static int portaudio_record_callback(
+    const void *inputBuffer,
+    void *outputBuffer,
+    unsigned long framesPerBuffer,
+    const PaStreamCallbackTimeInfo* timeInfo,
+    PaStreamCallbackFlags statusFlags,
+    void *userData );
 
 /// Main sound card device (capture) definition
@@ -110 +121 @@
     standardInterfaces_i::complexShort_u *dataOut;
 
-    // --- Sound capture variables ---
-    unsigned int length;           ///< 
-
     // Until I look at omni_condition... -TT
     bool isRunning;  ///< starts/stops loop in capture_sound()
+
+    // 
+    unsigned int samplerate_record;
+    unsigned int samplerate_playback;
+    unsigned int buffersize_record;
+    unsigned int buffersize_playback;
 
 };