Changeset 455

Timestamp:

04/09/07 04:25:12 (16 years ago)

Author:

ppalmers

Message:

- test-mixer volume control works (tested on phase88 only)
- volume control is exposed to the outside

Files:

• trunk/libffado/src/bebob/bebob_functionblock.h (modified) (1 diff)
• trunk/libffado/src/bebob/GenericMixer.cpp (modified) (2 diffs)
• trunk/libffado/src/bebob/GenericMixer.h (modified) (1 diff)
• trunk/libffado/src/libavc/avc_function_block.cpp (modified) (10 diffs)
• trunk/libffado/src/libavc/avc_function_block.h (modified) (2 diffs)
• trunk/libffado/tests/test-mixer.cpp (modified) (6 diffs)

trunk/libffado/src/bebob/bebob_functionblock.h

@@ -138 +138 @@
-
-    virtual const char* getName();
+    
+    // FIXME: this is not pretty!
+    enum EControlSelectorEncoding {
+        eCSE_Feature_Unknown            = 0x00,
+        eCSE_Feature_Mute               = 0x01,
+        eCSE_Feature_Volume             = 0x02,
+        eCSE_Feature_LRBalance          = 0x03,
+        eCSE_Feature_FRBalance          = 0x04,
+        eCSE_Feature_Bass               = 0x05,
+        eCSE_Feature_Mid                = 0x06,
+        eCSE_Feature_Treble             = 0x07,
+        eCSE_Feature_GEQ                = 0x08,
+        eCSE_Feature_AGC                = 0x09,
+        eCSE_Feature_Delay              = 0x0a,
+        eCSE_Feature_BassBoost          = 0x0b,
+        eCSE_Feature_Loudness           = 0x0c,
+    };
-
-protected:

trunk/libffado/src/bebob/GenericMixer.cpp

@@ -94 +94 @@
-                        return OscResponse(OscResponse::eError);
-                    }
-(m->getArgument(3).isInt64() || m->getArgument(3).isFloat()
+m->getArgument(3).isNumeric(
-                        debugWarning("set selector: Wrong argument type\n");
-                        return OscResponse(OscResponse::eError);
-                    }
-
-
-
-
-
-
+
-                    
-                    return mixerSetSelectorValue(id, value);
-                }
-                
+                if (type == "volume") {
+                    if ( !(nbArgs==7)) {
+                        debugWarning("set volume: Wrong nb of arguments\n");
+                        return OscResponse(OscResponse::eError);
+                    }
+                    if(!m->getArgument(3).isNumeric()) {
+                        debugWarning("set volume: Wrong argument (3) type\n");
+                        return OscResponse(OscResponse::eError);
+                    }
+                    if(!m->getArgument(4).isNumeric()) {
+                        debugWarning("set volume: Wrong argument (4) type\n");
+                        return OscResponse(OscResponse::eError);
+                    }
+                    
+                    int channel=m->getArgument(3).toInt();
+                    int volume=m->getArgument(4).toInt();
+                    
+                    return mixerSetFeatureVolumeValue(id, channel, volume);
+                }
+
-                return OscResponse(OscResponse::eError);
-            }
@@ -230 +245 @@
-}
-
+OscResponse 
+GenericMixer::mixerSetFeatureVolumeValue(int fb_id, int channel, 
+                                        int volume) {
+    OscMessage m;
+    
+    debugOutput(DEBUG_LEVEL_NORMAL,"Set feature volume %d channel %d to %d...\n",
+        fb_id, channel, volume);
+
+    FunctionBlockCmd fbCmd( m_p1394Service,
+                            FunctionBlockCmd::eFBT_Feature,
+                            fb_id,
+                            FunctionBlockCmd::eCA_Current );
+    fbCmd.setNodeId( m_device.getNodeId()  );
+    fbCmd.setSubunitId( 0x00 );
+    fbCmd.setCommandType( AVCCommand::eCT_Control );
+    fbCmd.m_pFBFeature->m_audioChannelNumber=channel;
+    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume;
+    fbCmd.m_pFBFeature->m_pVolume->m_volume=volume;
+
+    if ( !fbCmd.fire() ) {
+        debugError( "cmd failed\n" );
+    }
+
+    if (fbCmd.getResponse() != AVCCommand::eR_Accepted) {
+        return OscResponse(OscResponse::eError);
+    }
+
+    return OscResponse(m);
+}
+
+OscResponse 
+GenericMixer::mixerGetFeatureVolumeValue(int fb_id, int channel) {
+    OscMessage m;
+    
+    debugOutput(DEBUG_LEVEL_NORMAL,"Get feature volume %d channel %d...\n",
+        fb_id, channel);
+
+    FunctionBlockCmd fbCmd( m_p1394Service,
+                            FunctionBlockCmd::eFBT_Feature,
+                            fb_id,
+                            FunctionBlockCmd::eCA_Current );
+    fbCmd.setNodeId( m_device.getNodeId()  );
+    fbCmd.setSubunitId( 0x00 );
+    fbCmd.setCommandType( AVCCommand::eCT_Status );
+    fbCmd.m_pFBFeature->m_audioChannelNumber=channel;
+    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume;
+    fbCmd.m_pFBFeature->m_pVolume->m_volume=0;
+
+    if ( !fbCmd.fire() ) {
+        debugError( "cmd failed\n" );
+    }
+
+    if (fbCmd.getResponse() != AVCCommand::eR_Accepted) {
+        return OscResponse(OscResponse::eError);
+    }
+    
+    m.addArgument((int32_t)(fbCmd.m_pFBFeature->m_pVolume->m_volume));
+
+    return OscResponse(m);
+}
-
-} // end of namespace BeBoB

trunk/libffado/src/bebob/GenericMixer.h

@@ -51 +51 @@
-    OSC::OscResponse mixerGetSelectorValue(int id);
-    OSC::OscResponse mixerSetSelectorValue(int id, int value);
+    
+    OSC::OscResponse mixerSetFeatureVolumeValue(int id, int channel, int volume);
+    OSC::OscResponse mixerGetFeatureVolumeValue(int fb_id, int channel);
+    
-protected:
-    Ieee1394Service      &m_p1394Service;

trunk/libffado/src/libavc/avc_function_block.cpp

@@ -1 +1 @@
-/*
- * Copyright (C) 2005-2007 by Daniel Wagner
+ * Copyright (C) 2005-2007 by Pieter Palmers
- *
- * This file is part of FFADO
@@ -30 +31 @@
-FunctionBlockFeatureVolume::FunctionBlockFeatureVolume()
-    : IBusData()
-    , m_controlSelector( FunctionBlockFeature::eCSE_Feature_Volume )
-    , m_controlDataLength( 2 )
-    , m_volume( 0 )
@@ -37 +37 @@
-
-FunctionBlockFeatureVolume::FunctionBlockFeatureVolume( const FunctionBlockFeatureVolume& rhs )
-
-
+
-    , m_volume( rhs.m_volume )
-{
@@ -52 +51 @@
-    bool bStatus;
-    byte_t val;
-
-
+
-    val = (byte_t)(m_volume >> 8);
-    bStatus &= se.write( val,                  "FunctionBlockFeatureVolume volume high" );
@@ -67 +65 @@
-    bool bStatus;
-    byte_t val;
-
-
+
-    bStatus &= de.read( &val );
-    m_volume = val << 8;
@@ -327 +324 @@
-    , m_selectorLength( 0x02 )
-    , m_audioChannelNumber( 0x00 )
-
+
+
-{
-}
@@ -335 +333 @@
-    , m_selectorLength( rhs.m_selectorLength )
-    , m_audioChannelNumber( rhs.m_audioChannelNumber )
+    , m_controlSelector( rhs.m_controlSelector )
-{
-    if ( rhs.m_pVolume ) {
@@ -344 +343 @@
-{
-    delete m_pVolume;
-0
+NULL
-}
-
@@ -353 +352 @@
-    bStatus  = se.write( m_selectorLength,     "FunctionBlockFeature selectorLength" );
-    bStatus &= se.write( m_audioChannelNumber, "FunctionBlockFeature audioChannelNumber" );
-
-
+
+
+
-        bStatus &= m_pVolume->serialize( se );
-    } else {
@@ -369 +369 @@
-    bStatus  = de.read( &m_selectorLength );
-    bStatus &= de.read( &m_audioChannelNumber );
-
-
-
-
+
+
+
-    case eCSE_Feature_Volume:
-        if ( !m_pVolume ) {
-            m_pVolume = new FunctionBlockFeatureVolume;
-        }
-        bStatus &= m_pVolume->deserialize( de );
-        break;

trunk/libffado/src/libavc/avc_function_block.h

@@ -43 +43 @@
-    virtual FunctionBlockFeatureVolume* clone() const;
-
-    control_selector_t     m_controlSelector;
-    control_data_length_t  m_controlDataLength;
-    u_int16_t              m_volume;
@@ -147 +146 @@
-    virtual FunctionBlockFeature* clone() const;
-
-
-
+
+
+
-
-    FunctionBlockFeatureVolume*     m_pVolume;

trunk/libffado/tests/test-mixer.cpp

@@ -89 +89 @@
-
-bool
-doApp2
+selectorGet
-{
-    FunctionBlockCmd fbCmd( ieee1394service,
@@ -120 +120 @@
-
-bool
-doApp3
+selectorSet
-{
-    FunctionBlockCmd fbCmd( ieee1394service,
@@ -132 +132 @@
-
-    debugOutput(DEBUG_LEVEL_NORMAL, "Setting selector state to %d...\n", val);
+
+    fbCmd.setVerbose( bVerbose );
+    if (bVerbose) {
+        ieee1394service.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
+    }
+    
+    if ( !fbCmd.fire() ) {
+        debugError( "cmd failed\n" );
+    }
+
+    if ( bVerbose ) {
+        CoutSerializer se;
+        fbCmd.serialize( se );
+    }
+
+    return true;
+}
+
+bool
+volumeGet( Ieee1394Service& ieee1394service, int node_id, int fb_id, int channel )
+{
+    FunctionBlockCmd fbCmd( ieee1394service,
+                            FunctionBlockCmd::eFBT_Feature,
+                            fb_id,
+                            FunctionBlockCmd::eCA_Current );
+    fbCmd.setNodeId( node_id );
+    fbCmd.setSubunitId( 0x00 );
+    fbCmd.setCommandType( AVCCommand::eCT_Status );
+    fbCmd.m_pFBFeature->m_audioChannelNumber=channel;
+    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume;
+    fbCmd.m_pFBFeature->m_pVolume->m_volume=0;
+
+    debugOutput(DEBUG_LEVEL_NORMAL, "Requesting volume feature block state...\n");
+
+    fbCmd.setVerbose( bVerbose );
+    if (bVerbose) {
+        ieee1394service.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
+    }
+    
+    if ( !fbCmd.fire() ) {
+        debugError( "cmd failed\n" );
+    }
+
+    if ( bVerbose ) {
+        CoutSerializer se;
+        fbCmd.serialize( se );
+    }
+
+    return true;
+}
+
+bool
+volumeSet( Ieee1394Service& ieee1394service, int node_id, int fb_id, int channel, int value )
+{
+    FunctionBlockCmd fbCmd( ieee1394service,
+                            FunctionBlockCmd::eFBT_Feature,
+                            fb_id,
+                            FunctionBlockCmd::eCA_Current );
+    fbCmd.setNodeId( node_id );
+    fbCmd.setSubunitId( 0x00 );
+    fbCmd.setCommandType( AVCCommand::eCT_Control );
+    fbCmd.m_pFBFeature->m_audioChannelNumber=channel;
+    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume;
+    fbCmd.m_pFBFeature->m_pVolume->m_volume=value;
+
+    debugOutput(DEBUG_LEVEL_NORMAL, "Setting volume feature block channel %d state to %d...\n", channel, value);
-
-    fbCmd.setVerbose( bVerbose );
@@ -157 +223 @@
-{
-
-3
-FB_ID
+4
+CMD FB_ID [VAL1] [VAL2]
-        exit(0);
-    }
@@ -166 +232 @@
-    int port = strtol( argv[1], &tail, 0 );
-    int node_id = strtol( argv[2], &tail, 0 );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    if (errno) {
-        debugError("argument parsing failed: %s", strerror(errno));
@@ -178 +254 @@
-    }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return 0;