Changeset 5001

Timestamp:

09/10/07 11:13:06 (6 years ago)

Author:

jgaeddert

Message:

updating functionality of sound components

Location:

experimental/components/Sound/trunk/Sound-metadata

Files:

• Doxyfile (modified) (11 diffs)
• src/SoundCapture.cpp (modified) (2 diffs)
• src/SoundCapture.h (modified) (1 diff)
• src/SoundPlayback.cpp (modified) (3 diffs)
• src/SoundPlayback.h (modified) (4 diffs)
• src/main_capture.cpp (modified) (3 diffs)
• src/main_playback.cpp (modified) (4 diffs)

experimental/components/Sound/trunk/Sound-metadata/Doxyfile

@@ -1 @@
-# Doxyfile 1.4.6
+# Doxyfile 1.5.2
 
 # This file describes the settings to be used by the documentation system
@@ -15 +15 @@
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "Sound Card (Capture)"
+PROJECT_NAME           = "Sound Component Library"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
@@ -46 +54 @@
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
-# Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
@@ -205 +203 @@
 BUILTIN_STL_SUPPORT    = yes
 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
@@ -460 +463 @@
 # with spaces.
 
-INPUT                  = documentation.txt soundCardCapture.cpp soundCardCapture.h
+INPUT                  = documentation.txt \
+                         src/
+
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
@@ -496 +507 @@
 
 EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
@@ -582 +600 @@
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
 # If the USE_HTAGS tag is set to YES then the references to source code 
 # will point to the HTML generated by the htags(1) tool instead of doxygen 
@@ -659 +684 @@
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = 
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
@@ -1079 +1104 @@
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
@@ -1144 +1177 @@
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
@@ -1173 +1214 @@
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that a graph may be further truncated if the graph's 
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
-# the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen will always 
+# show the root nodes and its direct children regardless of this setting.
+
+DOT_GRAPH_MAX_NODES    = 50
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 

experimental/components/Sound/trunk/Sound-metadata/src/SoundCapture.cpp

@@ -29 +29 @@
 
 // Initializing constructor
-SoundCapture_i::SoundCapture_i(char *uuid, char *label, char *profile, omni_condition *condition) 
-  : Device_impl(uuid, label, profile), component_running(condition), isRunning(false)
+SoundCapture_i::SoundCapture_i(const char *uuid, omni_condition *condition)
+  : Resource_impl(uuid), component_running(condition)
 {
     DEBUG(3, SoundCapture, "constructor invoked")
@@ -45 +45 @@
 SoundCapture_i::~SoundCapture_i()
 {
-
+    delete dataOut;
 }
 

experimental/components/Sound/trunk/Sound-metadata/src/SoundCapture.h

@@ -33 +33 @@
 #include "ossie/cf.h"
 #include "ossie/PortTypes.h"
-#include "ossie/Device_impl.h"
 #include "ossie/Resource_impl.h"
 #include "ossie/debug.h"
 
-#include "standardinterfaces/complexShort.h"
 #include "standardinterfaces/complexShort_u.h"
 
 #include <alsa/asoundlib.h>
 
-/// Main sound card device (capture) definition
-class SoundCapture_i : public virtual Device_impl 
+/// Main sound capture definition
+class SoundCapture_i : public virtual Resource_impl 
 {
   public:
+    /// Initializing constructor
+    SoundCapture_i(const char *uuid, omni_condition *sem);
+
     /// Initializing constructor (old)
     SoundCapture_i(char *uuid, char* label, char* profile, omni_condition *condition);

experimental/components/Sound/trunk/Sound-metadata/src/SoundPlayback.cpp

@@ -29 +29 @@
 #include <iostream>
 
-#include "ossie/cf.h"
-#include "ossie/portability.h"
-
 #include "SoundPlayback.h"
 
 // Initializing constructor
-SoundPlayback_i::SoundPlayback_i(char *id, char *label, char *profile)
-  : Device_impl(id, label, profile), insert_idx(2), read_idx(0), length(0), data_available(&wait_for_data)
+SoundPlayback_i::SoundPlayback_i(const char *uuid, omni_condition *condition)
+    : Resource_impl(uuid), component_running(condition)
 {
     DEBUG(3, SoundPlayback, "constructor invoked")
+
+    // Create port for input sound samples
+    dataIn = new standardInterfaces_i::complexShort_p("bitsIn");
 
     // initialize variables
@@ -44 +44 @@
 
     // Start the play_sound thread
-    sound_thread = new omni_thread(run, (void *) this);
-    sound_thread->start();
+    processing_thread = new omni_thread(run, (void *) this);
+    processing_thread->start();
 }
 
@@ -77 +77 @@
 {
     DEBUG(3, SoundPlayback, "getPort() invoked with : " << portName)
+
+    CORBA::Object_var p;
+
+    p = dataIn->getPort(portName);
+
+    if (!CORBA::is_nil(p))
+        return p._retn();
+
+    // Port not found; throw exception
+    throw CF::PortSupplier::UnknownPort();
+
 }
 

experimental/components/Sound/trunk/Sound-metadata/src/SoundPlayback.h

@@ -27 +27 @@
 */
 
+#include <stdlib.h>
 #include <omnithread.h>
 #include <alsa/asoundlib.h>
@@ -32 +33 @@
 #include "ossie/cf.h"
 #include "ossie/PortTypes.h"
+#include "ossie/Resource_impl.h"
 #include "ossie/debug.h"
 
-#include "soundControl.h"
-#include "complexShort.h"
+#include "standardinterfaces/complexShort_p.h"
 
-#include "ossie/Device_impl.h"
-
-/// Main Sound card device definition
-class SoundPlayback_i : public virtual Device_impl
-
+/// Main sound playback definition
+class SoundPlayback_i : public virtual Resource_impl
 {
   public:
     /// Initializing constructor
-    SoundPlayback_i(char *id, char *label, char *profile);
+    SoundPlayback_i(const char *uuid, omni_condition *sem);
 
     /// Default destructor
@@ -83 +81 @@
         throw (CF::LifeCycle::ReleaseError, CORBA::SystemException);
 
+  private:
+    /// Disallowing default constructor
+    SoundPlayback_i();
+
+    /// Disallowing copy constructor
+    SoundPlayback_i(SoundPlayback_i&);
+
+    /// Main processing playback loop
+    void play_sound();
+
+    omni_condition *component_running; ///< for component shutdown
+    omni_thread *processing_thread;    ///< for component writer function
+
+    /// Port: input sound samples
+    standardInterfaces_i::complexShort_p *dataIn;
+
     // --- Sound playback variables ---
 
-    ///
     snd_pcm_t *pcm_handle;
-
-    ///
     snd_pcm_uframes_t periodsize;
 
@@ -99 +110 @@
     unsigned int length;
 
-    /// Sound playback thread
-    omni_thread *sound_thread;
-
-  private:
-    /// Disallowing default constructor
-    SoundPlayback_i();
-
-    /// Disallowing copy constructor
-    SoundPlayback_i(SoundPlayback_i&);
-
-    /// Main processing playback loop
-    void play_sound();
-
 };
 

experimental/components/Sound/trunk/Sound-metadata/src/main_capture.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2005,2006 Virginia Polytechnic Institute and State University
+Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE SoundCardCapture.
+This file is part of the OSSIE SoundCapture.
 
-OSSIE SoundCardCapture is free software; you can redistribute it and/or modify
+OSSIE SoundCapture is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE SoundCardCapture is distributed in the hope that it will be useful,
+OSSIE SoundCapture is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE SoundCardCapture; if not, write to the Free Software
+along with OSSIE SoundCapture; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -22 +22 @@
 
 #include <iostream>
-#include <string>
-
-#include "ossie/debug.h"
 #include "ossie/ossieSupport.h"
 
-#include "soundCardCapture.h"
+#include "SoundCapture.h"
 
-int main(int argc, char *argv[])
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
+
+
+int main(int argc, char* argv[])
 
 {
-    ossieDebugLevel = 3;
+    ossieSupport::ORB *orb = new ossieSupport::ORB;
+    omni_mutex component_running_mutex;
+    omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ORB* orbsup = new ossieSupport::ORB();
-
-    char *id, *profile, *label;
-
-    if (argc != 4) {
-        std::cout << argv[0] << " : <identifier> <name> <SPD Profile>" << std::endl;
-        exit(-1);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
     }
 
-    id = argv[1];
-    label = argv[2];
-    profile = argv[3];
+    char *uuid = argv[1];
+    char *label = argv[2];
 
-    DEBUG(1, SoundCardCapture, "Identifier = " << id << "Label = " << label << " Profile = " << profile)
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
+    SoundCapture_i* soundcapture_servant;
+    CF::Resource_var soundcapture_var;
 
-    // Create Executable device servant and object reference
-    SoundCardCapture_i* SoundCardCapture_servant;
-    CF::ExecutableDevice_var SoundCardCapture_var;
+    // Create the soundcapture component servant and object reference
 
-    SoundCardCapture_servant = new SoundCardCapture_i(id, label, profile);
-    SoundCardCapture_var = SoundCardCapture_servant->_this();
+    soundcapture_servant = new SoundCapture_i(uuid, component_running);
+    soundcapture_var = soundcapture_servant->_this();
 
-    // Add the object to the Naming Service
-    string objName = "DomainName1/";
-    objName += label;
+    orb->bind_object_to_name((CORBA::Object_ptr) soundcapture_var, label);
 
-    orbsup->bind_object_to_name((CORBA::Object_ptr) SoundCardCapture_var, objName.c_str());
+    // This bit is ORB specific
+    // omniorb is threaded and the servants are running at this point
+    // so we block on the condition
+    // The releaseObject method clear the condition and the component exits
 
-    // Start handling CORBA requests
-    orbsup->orb->run();
+    component_running->wait();
+    orb->unbind_name(label);
+    orb->orb->shutdown(0);
+
 }

experimental/components/Sound/trunk/Sound-metadata/src/main_playback.cpp

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Sound_out Device.
+This file is part of the OSSIE SoundPlayback.
 
-OSSIE Sound_out Device is free software; you can redistribute it and/or modify
+OSSIE SoundPlayback is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE Sound_out Device is distributed in the hope that it will be useful,
+OSSIE SoundPlayback is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE Sound_out Device; if not, write to the Free Software
+along with OSSIE SoundPlayback; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
 
 ****************************************************************************/
@@ -25 +24 @@
 #include "ossie/ossieSupport.h"
 
-#include "soundCardPlayback.h"
+#include "SoundPlayback.h"
 
 using namespace std;
@@ -34 +33 @@
 
 {
-    ossieDebugLevel = 3;
+    ossieSupport::ORB *orb = new ossieSupport::ORB;
+    omni_mutex component_running_mutex;
+    omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ORB *orb = new ossieSupport::ORB;
-
-    if (argc != 4) {
-        cout << argv[0] << " <identifier> <usage name> <software profile>" << endl;
-        exit (-1);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
     }
 
-    char *id = argv[1];
+    char *uuid = argv[1];
     char *label = argv[2];
-    char *profile = argv[3]; 
 
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    SoundCardPlayback_i* soundCardPlayback_servant;
-    CF::Device_var soundCardPlayback_var;
+    SoundPlayback_i* soundplayback_servant;
+    CF::Resource_var soundplayback_var;
 
-    // Create the Sound Card device servant and object reference
+    // Create the soundplayback component servant and object reference
 
-    soundCardPlayback_servant = new SoundCardPlayback_i(id, label, profile);
-    soundCardPlayback_var = soundCardPlayback_servant->_this();
+    soundplayback_servant = new SoundPlayback_i(uuid, component_running);
+    soundplayback_var = soundplayback_servant->_this();
 
-    string objName = "DomainName1/";
-    objName += label;
-    orb->bind_object_to_name((CORBA::Object_ptr) soundCardPlayback_var, objName.c_str());
+    orb->bind_object_to_name((CORBA::Object_ptr) soundplayback_var, label);
 
-    // Create control ports for sound in and out control
+    // This bit is ORB specific
+    // omniorb is threaded and the servants are running at this point
+    // so we block on the condition
+    // The releaseObject method clear the condition and the component exits
 
-    soundOutControl_i* soundOutControl_servant;
-    audioOutControl_var soundOutControl_var;
-
-    soundOutControl_servant = new soundOutControl_i();
-    soundOutControl_var = soundOutControl_servant->_this();
-
-    soundInControl_i* soundInControl_servant;
-    audioInControl_var soundInControl_var;
-
-    soundInControl_servant = new soundInControl_i();
-    soundInControl_var = soundInControl_servant->_this();
-
-    objName = "DomainName1/";
-    objName += "soundOutControl";
-    orb->bind_object_to_name((CORBA::Object_ptr) soundOutControl_var, objName.c_str());
-    
-    objName = "DomainName1/";
-    objName += "soundInControl";
-    orb->bind_object_to_name((CORBA::Object_ptr) soundInControl_var, objName.c_str());
-
-
-    // Create the ports for sound output data
-
-    soundOut_i* soundOut;
-
-    complexShort_var soundOut_var;
-
-    soundOut = new soundOut_i(soundCardPlayback_servant);
-    soundOut_var = soundOut->_this();
-
-    objName = "DomainName1/";
-    objName += "soundOut";
-    orb->bind_object_to_name((CORBA::Object_ptr) soundOut_var, objName.c_str());
-
-#if 0 // Save for when I need to input from souncard
-    // Create the ports for RX Data
-
-    RX_data_i *rx_data_1;
-
-    CF::Port_var rx_data_1_var;
-
-    rx_data_1 = new RX_data_i(1);
-
-    rx_data_1_var = rx_data_1->_this();
-
-    objName = "DomainName1/";
-    objName += "RX_Data_1";
-    orb->bind_object_to_name((CORBA::Object_var) rx_data_1_var, objName.c_str());
-#endif
-
-    // Start the orb
-    orb->orb->run();
+    component_running->wait();
+    orb->unbind_name(label);
+    orb->orb->shutdown(0);
 
 }