More explicit global variables names

src/global.h

@@ -71,7 +71,7 @@ typedef short int16;
 #define CHANNELS				2
 #define SIZEBUF 				1024*1024
 
-#define ALSA_DFT_HW_INDEX     0
+#define ALSA_DFT_CARD_ID     0
 
 #define PCM_HW		"hw"
 #define PCM_PLUGHW	"plughw"

src/managerimpl.cpp

@@ -1067,10 +1067,10 @@ ManagerImpl::initConfigFile (void)
   fill_config_int(SEND_DTMF_AS, SIP_INFO_STR);
 
   section = AUDIO;
-  fill_config_int(DRIVER_NAME_IN, DFT_DRIVER_STR);
-  fill_config_int(DRIVER_NAME_OUT, DFT_DRIVER_STR);
-  fill_config_int(DRIVER_SAMPLE_RATE, DFT_SAMPLE_RATE);
-  fill_config_int(DRIVER_FRAME_SIZE, DFT_FRAME_SIZE);
+  fill_config_int(ALSA_CARD_ID_IN, ALSA_DFT_CARD);
+  fill_config_int(ALSA_CARD_ID_OUT, ALSA_DFT_CARD);
+  fill_config_int(ALSA_SAMPLE_RATE, DFT_SAMPLE_RATE);
+  fill_config_int(ALSA_FRAME_SIZE, DFT_FRAME_SIZE);
   fill_config_str(ALSA_PLUGIN, PCM_DEFAULT); 
   fill_config_str(RING_CHOICE, DFT_RINGTONE);
   fill_config_int(VOLUME_SPKR, DFT_VOL_SPKR_STR);
@@ -1307,7 +1307,7 @@ ManagerImpl::setAudioOutputDevice(const int index)
       SFL_PCM_PLAYBACK,
       _audiodriver->getAudioPlugin());
   // set config
-  setConfig( AUDIO , DRIVER_NAME_OUT , index );
+  setConfig( AUDIO , ALSA_CARD_ID_OUT , index );
 }
 
 /**
@@ -1334,7 +1334,7 @@ ManagerImpl::setAudioInputDevice(const int index)
       SFL_PCM_CAPTURE,
       _audiodriver->getAudioPlugin());
   // set config
-  setConfig( AUDIO , DRIVER_NAME_IN , index );
+  setConfig( AUDIO , ALSA_CARD_ID_IN , index );
 }
 
 /**
@@ -1396,28 +1396,28 @@ ManagerImpl::initAudioDriver(void)
 ManagerImpl::selectAudioDriver (void)
 {
   std::string alsaPlugin = getConfigString( AUDIO , ALSA_PLUGIN );
-  int noDeviceIn  = getConfigInt(AUDIO, DRIVER_NAME_IN);
-  int noDeviceOut = getConfigInt(AUDIO, DRIVER_NAME_OUT);
-  int sampleRate  = getConfigInt(AUDIO, DRIVER_SAMPLE_RATE);
+  int numCardIn  = getConfigInt( AUDIO , ALSA_CARD_ID_IN );
+  int numCardOut = getConfigInt( AUDIO , ALSA_CARD_ID_OUT );
+  int sampleRate = getConfigInt( AUDIO , ALSA_SAMPLE_RATE );
   if (sampleRate <=0 || sampleRate > 48000) {
     sampleRate = 44100;
   }
-  int frameSize = getConfigInt(AUDIO, DRIVER_FRAME_SIZE);
+  int frameSize = getConfigInt( AUDIO , ALSA_FRAME_SIZE );
 
-  if( !_audiodriver -> soundCardIndexExist( noDeviceIn ) )
+  if( !_audiodriver -> soundCardIndexExist( numCardIn ) )
   {
-    _debug(" Index %i is not a valid card number. Switch to 0.\n", noDeviceIn);
-    noDeviceIn = ALSA_DFT_HW_INDEX ;
+    _debug(" Index %i is not a valid card number. Switch to 0.\n", numCardIn);
+    numCardIn = ALSA_DFT_CARD_ID ;
   }
-  if( !_audiodriver -> soundCardIndexExist( noDeviceOut ) )
+  if( !_audiodriver -> soundCardIndexExist( numCardOut ) )
   {  
-    _debug(" Index %i is not a valid card number. Switch to 0.\n", noDeviceIn);
-    noDeviceOut = ALSA_DFT_HW_INDEX ;
+    _debug(" Index %i is not a valid card number. Switch to 0.\n", numCardOut);
+    numCardOut = ALSA_DFT_CARD_ID ;
   }
 
   _debugInit(" AudioLayer Opening Device");
   _audiodriver->setErrorMessage("");
-  _audiodriver->openDevice( noDeviceIn , noDeviceOut, sampleRate, frameSize, SFL_PCM_BOTH, alsaPlugin ); 
+  _audiodriver->openDevice( numCardIn , numCardOut, sampleRate, frameSize, SFL_PCM_BOTH, alsaPlugin ); 
 }
 
 /**

src/user_cfg.h

@@ -58,11 +58,10 @@
 #define SEND_DTMF_AS	"DTMF.sendDTMFas"
 #define STUN_SERVER		"STUN.STUNserver"
 #define USE_STUN		"STUN.useStun"
-#define DRIVER_NAME		"Drivers.driverName"
-#define DRIVER_NAME_IN		"Drivers.driverNameIn"
-#define DRIVER_NAME_OUT		"Drivers.driverNameOut"
-#define DRIVER_SAMPLE_RATE      "Drivers.sampleRate"
-#define DRIVER_FRAME_SIZE	"Drivers.framesize"
+#define ALSA_CARD_ID_IN		"Alsa.cardID_In"
+#define ALSA_CARD_ID_OUT	"Alsa.cardID_Out"
+#define ALSA_SAMPLE_RATE	"Alsa.sampleRate"
+#define ALSA_FRAME_SIZE		"Alsa.framesize"
 #define ALSA_PLUGIN		"Alsa.plugin"	
 #define CODECS			"ActiveCodecs"
 #define RING_CHOICE		"Rings.ringChoice"
@@ -88,7 +87,7 @@
 #define	NO_STR               "0"
 #define DFT_PULSE_LENGTH_STR "250"
 #define SIP_INFO_STR         "0"
-#define DFT_DRIVER_STR       "0"
+#define ALSA_DFT_CARD	    "0"
 // volume by default 100%
 #define DFT_VOL_SPKR_STR     "100"
 #define DFT_VOL_MICRO_STR    "100"
@@ -99,7 +98,7 @@
 #define DFT_VOICEMAIL 		"888"
 #define DFT_FRAME_SIZE		"20"
 #define DFT_SAMPLE_RATE		"44100"
-#define SAMPLE_RATE1	"44100"
+
 // zeroconfig default value
 #ifdef USE_ZEROCONF
 #define CONFIG_ZEROCONF_DEFAULT_STR "1"