Show
Ignore:
Timestamp:
02/25/07 04:28:00 (17 years ago)
Author:
pieterpalmers
Message:

namespace simplification

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/streaming-rework/src/motu/motu_avdevice.cpp

    r416 r419  
    389389        } 
    390390 
    391         m_receiveProcessor=new FreebobStreaming::MotuReceiveStreamProcessor( 
     391        m_receiveProcessor=new Streaming::MotuReceiveStreamProcessor( 
    392392                m_p1394Service->getPort(), samp_freq, event_size_in); 
    393393 
     
    404404         
    405405        char *buff; 
    406         FreebobStreaming::Port *p=NULL; 
     406        Streaming::Port *p=NULL; 
    407407         
    408408        // retrieve the ID 
     
    413413     
    414414        // Add audio capture ports 
    415         if (!addDirPorts(FreebobStreaming::Port::E_Capture, samp_freq, optical_in_mode)) { 
     415        if (!addDirPorts(Streaming::Port::E_Capture, samp_freq, optical_in_mode)) { 
    416416                return false; 
    417417        } 
     
    421421        // event data. 
    422422        asprintf(&buff,"%s_cap_MIDI0",id.c_str()); 
    423         p = new FreebobStreaming::MotuMidiPort(buff, 
    424                 FreebobStreaming::Port::E_Capture, 4); 
     423        p = new Streaming::MotuMidiPort(buff, 
     424                Streaming::Port::E_Capture, 4); 
    425425        if (!p) { 
    426426                debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n", buff); 
     
    438438        // example of adding an control port: 
    439439//    asprintf(&buff,"%s_cap_%s",id.c_str(),"myportnamehere"); 
    440 //    p=new FreebobStreaming::MotuControlPort( 
     440//    p=new Streaming::MotuControlPort( 
    441441//            buff, 
    442 //            FreebobStreaming::Port::E_Capture,  
     442//            Streaming::Port::E_Capture,  
    443443//            0 // you can add all other port specific stuff you  
    444444//              // need to pass by extending MotuXXXPort and MotuPortInfo 
     
    459459 
    460460        // Do the same for the transmit processor 
    461         m_transmitProcessor=new FreebobStreaming::MotuTransmitStreamProcessor( 
     461        m_transmitProcessor=new Streaming::MotuTransmitStreamProcessor( 
    462462                m_p1394Service->getPort(), getSamplingFrequency(), event_size_out); 
    463463 
     
    473473 
    474474        // Add audio playback ports 
    475         if (!addDirPorts(FreebobStreaming::Port::E_Playback, samp_freq, optical_out_mode)) { 
     475        if (!addDirPorts(Streaming::Port::E_Playback, samp_freq, optical_out_mode)) { 
    476476                return false; 
    477477        } 
     
    481481        // of the event data. 
    482482        asprintf(&buff,"%s_pbk_MIDI0",id.c_str()); 
    483         p = new FreebobStreaming::MotuMidiPort(buff, 
    484                 FreebobStreaming::Port::E_Capture, 4); 
     483        p = new Streaming::MotuMidiPort(buff, 
     484                Streaming::Port::E_Capture, 4); 
    485485        if (!p) { 
    486486                debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n", buff); 
     
    499499//    asprintf(&buff,"%s_pbk_%s",id.c_str(),"myportnamehere"); 
    500500//     
    501 //    p=new FreebobStreaming::MotuControlPort( 
     501//    p=new Streaming::MotuControlPort( 
    502502//            buff, 
    503 //            FreebobStreaming::Port::E_Playback,  
     503//            Streaming::Port::E_Playback,  
    504504//            0 // you can add all other port specific stuff you  
    505505//              // need to pass by extending MotuXXXPort and MotuPortInfo 
     
    526526} 
    527527 
    528 FreebobStreaming::StreamProcessor * 
     528Streaming::StreamProcessor * 
    529529MotuDevice::getStreamProcessorByIndex(int i) { 
    530530        switch (i) { 
     
    730730/* ======================================================================= */ 
    731731 
    732 bool MotuDevice::addPort(FreebobStreaming::StreamProcessor *s_processor, 
    733   char *name, enum FreebobStreaming::Port::E_Direction direction,  
     732bool MotuDevice::addPort(Streaming::StreamProcessor *s_processor, 
     733  char *name, enum Streaming::Port::E_Direction direction,  
    734734  int position, int size) { 
    735735/* 
     
    739739 * prior to exit. 
    740740 */ 
    741 FreebobStreaming::Port *p=NULL; 
    742  
    743         p = new FreebobStreaming::MotuAudioPort(name, direction, position, size); 
     741Streaming::Port *p=NULL; 
     742 
     743        p = new Streaming::MotuAudioPort(name, direction, position, size); 
    744744 
    745745        if (!p) { 
     
    761761 
    762762bool MotuDevice::addDirPorts( 
    763   enum FreebobStreaming::Port::E_Direction direction,  
     763  enum Streaming::Port::E_Direction direction,  
    764764  unsigned int sample_rate, unsigned int optical_mode) { 
    765765/* 
     
    771771 * create all ports and just disable those which are not active. 
    772772 */ 
    773 const char *mode_str = direction==FreebobStreaming::Port::E_Capture?"cap":"pbk"; 
    774 const char *aux_str = direction==FreebobStreaming::Port::E_Capture?"Mix1":"Phones"; 
    775 FreebobStreaming::StreamProcessor *s_processor; 
     773const char *mode_str = direction==Streaming::Port::E_Capture?"cap":"pbk"; 
     774const char *aux_str = direction==Streaming::Port::E_Capture?"Mix1":"Phones"; 
     775Streaming::StreamProcessor *s_processor; 
    776776unsigned int i, ofs; 
    777777char *buff; 
     
    783783    } 
    784784 
    785         if (direction == FreebobStreaming::Port::E_Capture) { 
     785        if (direction == Streaming::Port::E_Capture) { 
    786786                s_processor = m_receiveProcessor; 
    787787        } else { 
     
    819819                                asprintf(&buff,"%s_%s_AES/EBU%d", id.c_str(), mode_str, i+1); 
    820820                        } else { 
    821                                 if (direction == FreebobStreaming::Port::E_Capture) 
     821                                if (direction == Streaming::Port::E_Capture) 
    822822                                        asprintf(&buff,"%s_%s_Mic%d", id.c_str(), mode_str, i+1); 
    823823                                else 
  • branches/streaming-rework/src/motu/motu_avdevice.h

    r416 r419  
    113113 
    114114    virtual int getStreamCount(); 
    115     virtual FreebobStreaming::StreamProcessor *getStreamProcessorByIndex(int i); 
     115    virtual Streaming::StreamProcessor *getStreamProcessorByIndex(int i); 
    116116 
    117117    virtual bool prepare(); 
     
    140140    signed int m_bandwidth; 
    141141     
    142         FreebobStreaming::MotuReceiveStreamProcessor *m_receiveProcessor; 
    143         FreebobStreaming::MotuTransmitStreamProcessor *m_transmitProcessor; 
     142        Streaming::MotuReceiveStreamProcessor *m_receiveProcessor; 
     143        Streaming::MotuTransmitStreamProcessor *m_transmitProcessor; 
    144144 
    145145private: 
    146         bool addPort(FreebobStreaming::StreamProcessor *s_processor, 
     146        bool addPort(Streaming::StreamProcessor *s_processor, 
    147147                char *name,  
    148                 enum FreebobStreaming::Port::E_Direction direction, 
     148                enum Streaming::Port::E_Direction direction, 
    149149                int position, int size); 
    150150        bool addDirPorts( 
    151                 enum FreebobStreaming::Port::E_Direction direction, 
     151                enum Streaming::Port::E_Direction direction, 
    152152                unsigned int sample_rate, unsigned int optical_mode); 
    153153