Add configurable sound card channels

dev_ui/dbupdate.php

@@ -22,6 +22,7 @@
 
 # Check and Update Database Structure with new fields if they don't already exist
 $classDB->add_record('settings','ID_Only_When_Active','False');
+$classDB->add_record('settings','CARD_CHANNELS','2');
 $classDB->add_record('settings','Location_Info','');
 $classDB->add_record('settings','LinkGroup_Settings','');
 $classDB->add_record('system_flags','config_files','');
@@ -130,4 +131,4 @@ function serial2JSON($setting, $table, $db) {
 // SESSION CHECK TO SEE IF USER IS LOGGED IN.
  } // close ELSE to end login check from top of page
 // --------------------------------------------------------
-?>
+?>

includes/classes/SVXLink.php

@@ -95,6 +95,8 @@ public function build_global() {
 		$global_array['CFG_DIR'] = 'svxlink.d';
 		$global_array['TIMESTAMP_FORMAT'] = '"%c"';
 		$global_array['CARD_SAMPLE_RATE'] = '48000';
+		$cardChannels = isset($this->settingsArray['CARD_CHANNELS']) ? $this->settingsArray['CARD_CHANNELS'] : '2';
+		$global_array['CARD_CHANNELS'] = (is_numeric($cardChannels) && $cardChannels >= 1) ? (int) $cardChannels : '2';
 		//$global_array['LOCATION_INFO'] = 'LocationInfo';
 
 		// Add Link Sections if defined

install/dev/test.php

@@ -14,6 +14,7 @@
 		"rxTone"				=>		"",
 		"txTailValueSec"		=>		"2",
 		"txTone"				=>		"",
+		"CARD_CHANNELS"			=>		"2",
 		"courtesyMode"			=>		"beep",
 		"ID_Short_Mode"			=>		"morse",
 		"ID_Long_Mode"			=>		"voice",

install/svxlink-conf/svxlink.conf

@@ -10,6 +10,7 @@ LOGICS=RepeaterLogic,LinkLogic
 CFG_DIR=svxlink.d
 TIMESTAMP_FORMAT="%c"
 CARD_SAMPLE_RATE=16000
+CARD_CHANNELS=2
 #LOCATION_INFO=LocationInfo
 #LINKS=ALLlink,NetLink
 HEARTBEAT_TIMEOUT = 10
@@ -366,4 +367,3 @@ CALLSIGN=ER-MYCALL
 1=EchoLink:9999#
 9=Parrot:0123456789#
 03400=EchoLink:9999#
-

settings.php

@@ -15,6 +15,8 @@
 // $customCSS = 'page-ports.css'; // 'file1.css, file2.css, ... '
 
 include('includes/header.php');
+
+$cardChannels = isset($settings['CARD_CHANNELS']) ? $settings['CARD_CHANNELS'] : '2';
 ?>
 
         <!-- page content -->
@@ -72,6 +74,15 @@
                         </div>
                       </div>
 
+                      <div class="form-group">
+                        <label class="control-label col-md-6 col-sm-3 col-xs-5"><?=_('Sound Card Channels')?>
+						  <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title="<?=_('The number of channels supported by the sound card. Multi-channel cards may require this value for SVXLink to start correctly.')?>"></i>
+                        </label>
+                        <div class="col-md-6 col-sm-9 col-xs-7">
+						  <input id="CARD_CHANNELS" name="CARD_CHANNELS" type="number" min="1" step="1" class="form-control" value="<?= $cardChannels ?>" placeholder="<?=_('Channels')?>">
+                        </div>
+                      </div>
+
                     </form>
                   </div>
                 </div>
@@ -438,4 +449,4 @@
 // SESSION CHECK TO SEE IF USER IS LOGGED IN.
  } // close ELSE to end login check from top of page
 // --------------------------------------------------------
-?>
+?>

wizard/includes/database_defaults.json

@@ -10,6 +10,7 @@
 		"rxTone": "0",
 		"txTailValueSec": "1",
 		"txTone": "0",
+		"CARD_CHANNELS": "2",
 		"courtesyMode": "beep",
 		"ID_Short_Mode": "morse",
 		"ID_Long_Mode": "voice",
@@ -88,4 +89,4 @@
 		}
 	}
 
-}
+}