From 674d55e6059042ca89027fda5b8119826054b547 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sun, 7 Feb 2016 18:16:27 +0000
Subject: [PATCH] Remove support for pa_device in the config file (now have a
 device command-line option).

---
 src/libespeak-ng/synthdata.c | 4 ----
 src/libespeak-ng/wave.c      | 5 -----
 src/libespeak-ng/wave.h      | 2 --
 src/libespeak-ng/wavegen.c   | 1 -
 4 files changed, 12 deletions(-)

diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c
index d647ebb6..2f356de0 100644
--- a/src/libespeak-ng/synthdata.c
+++ b/src/libespeak-ng/synthdata.c
@@ -42,8 +42,6 @@
 const char *version_string = "1.48.15  16.Apr.15";
 const int version_phdata  = 0x014801;
 
-int option_device_number = -1;
-
 // copy the current phoneme table into here
 int n_phoneme_tab;
 int current_phoneme_table;
@@ -427,8 +425,6 @@ void LoadConfig(void)
 
 		if (memcmp(buf, "tone", 4) == 0)
 			ReadTonePoints(&buf[5], tone_points);
-		else if (memcmp(buf, "pa_device", 9) == 0)
-			sscanf(&buf[10], "%d", &option_device_number);
 		else if (memcmp(buf, "soundicon", 9) == 0) {
 			ix = sscanf(&buf[10], "_%c %s", &c1, string);
 			if (ix == 2) {
diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c
index 51fbae9b..b154d8c8 100644
--- a/src/libespeak-ng/wave.c
+++ b/src/libespeak-ng/wave.c
@@ -440,11 +440,6 @@ static const PaDeviceInfo *select_device(const char *device)
 	const PaDeviceInfo *deviceInfo = NULL;
 	const PaDeviceInfo *selectedDeviceInfo = NULL;
 
-	if (option_device_number >= 0) {
-		selectedIndex = option_device_number;
-		selectedDeviceInfo = Pa_GetDeviceInfo(selectedIndex);
-	}
-
 	if (device == NULL) {
 #if (USE_PORTAUDIO == 19)
 		selectedIndex = Pa_GetDefaultOutputDevice();
diff --git a/src/libespeak-ng/wave.h b/src/libespeak-ng/wave.h
index 482b94d6..554dffef 100644
--- a/src/libespeak-ng/wave.h
+++ b/src/libespeak-ng/wave.h
@@ -25,8 +25,6 @@ extern "C"
 {
 #endif
 
-extern int option_device_number;
-
 extern void *wave_open(int samplerate, const char *device);
 extern size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize);
 extern int wave_close(void *theHandler);
diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c
index 4b7c0179..e60389fd 100644
--- a/src/libespeak-ng/wavegen.c
+++ b/src/libespeak-ng/wavegen.c
@@ -58,7 +58,6 @@ int embedded_value[N_EMBEDDED_VALUES];
 static int PHASE_INC_FACTOR;
 int samplerate = 0; // this is set by Wavegeninit()
 int samplerate_native = 0;
-extern int option_device_number;
 
 static wavegen_peaks_t peaks[N_PEAKS];
 static int peak_harmonic[N_PEAKS];