Changeset 580

Show
Ignore:
Timestamp:
08/29/07 01:26:54 (16 years ago)
Author:
ppalmers
Message:

move vendor specific stuff to vendor directory

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/bebob/bebob_avdevice.cpp

    r561 r580  
    2626#include "bebob/bebob_avdevice.h" 
    2727#include "bebob/bebob_avdevice_subunit.h" 
    28 #include "bebob/GenericMixer.h" 
    29 #include "bebob/vendorspecific/focusrite.h" 
    30 #include "bebob/vendorspecific/terratec.h" 
     28#include "bebob/bebob_mixer.h" 
     29 
     30#include "bebob/focusrite/focusrite.h" 
     31#include "bebob/terratec/terratec.h" 
    3132 
    3233#include "libieee1394/configrom.h" 
    …… 
    9495{ 
    9596    if(m_Mixer != NULL) { 
    96         if (!removeChildOscNode(m_Mixer)) { 
    97             debugWarning("failed to unregister mixer from OSC namespace\n"); 
    98         } 
    9997        delete m_Mixer; 
    10098    } 
    …… 
    211209    } 
    212210 
    213 // replaced by the previous Unit discovery 
    214 //     if ( !enumerateSubUnits() ) { 
    215 //         debugError( "Could not enumarate sub units\n" ); 
    216 //         return false; 
    217 //     } 
    218  
    219     // create a GenericMixer and add it as an OSC child node 
    220     //  remove if already there 
     211    // create a Mixer 
     212    // this removes the mixer if it already exists 
     213    // note: a mixer self-registers to it's parent 
    221214    if(m_Mixer != NULL) { 
    222         if (!removeChildOscNode(m_Mixer)) { 
    223             debugWarning("failed to unregister mixer from OSC namespace\n"); 
    224         } 
    225215        delete m_Mixer; 
    226216    } 
    227217 
    228     //  create the mixer & register it 
     218//      create the mixer & register it 
    229219    if(getAudioSubunit(0) == NULL) { 
    230220        debugWarning("Could not find audio subunit, mixer not available.\n"); 
    231221        m_Mixer = NULL; 
    232222    } else { 
    233         m_Mixer = new GenericMixer(*m_p1394Service , *this); 
    234         if (!addChildOscNode(m_Mixer)) { 
    235             debugWarning("failed to register mixer in OSC namespace\n"); 
    236         } 
     223        m_Mixer = new Mixer(*this); 
    237224    } 
    238225    return true; 

  • trunk/libffado/src/bebob/bebob_avdevice.h

    r560 r580  
    3636#include "bebob/bebob_avplug.h" 
    3737#include "bebob/bebob_avdevice_subunit.h" 
    38 #include "bebob/GenericMixer.h" 
     38#include "bebob/bebob_mixer.h" 
    3939 
    4040#include "libstreaming/AmdtpStreamProcessor.h" 
    …… 
    9696 
    9797protected: 
    98     GenericMixer*             m_Mixer; 
     98    Mixer*             m_Mixer; 
    9999 
    100100};