Add french male voice #60

.vscode/tasks.json

@@ -10,7 +10,7 @@
             "args": [
                 "-j9",
                 "ENABLE_DEBUG=1",
-                "USE_GPSD=1",
+               // "USE_GPSD=1",
                 "all"
             ],
             "group": {

Common/AudioUnit.cpp

@@ -72,6 +72,10 @@ void CAudioUnit::setLanguage(const std::string & dir, TEXT_LANG language)
 			ambeFileName = "fr_FR.ambe";
 			indxFileName = "fr_FR.indx";
 			break;
+		case TL_FRANCAIS2:
+			ambeFileName = "fr_FR2.ambe";
+			indxFileName = "fr_FR2.indx";
+			break;
 		case TL_ESPANOL:
 			ambeFileName = "es_ES.ambe";
 			indxFileName = "es_ES.indx";

Common/Defs.h

@@ -91,6 +91,7 @@ enum TEXT_LANG {
 	TL_DEUTSCH,
 	TL_DANSK,
 	TL_FRANCAIS,
+	TL_FRANCAIS2,
 	TL_ITALIANO,
 	TL_POLSKI,
 	TL_ENGLISH_US,

DGWTimeServer/example.cfg

@@ -2,7 +2,7 @@
 callsign=       # call of the gateway to send time beacons without G letter
 address=    # address of the gateway, defaults to 127.0.0.1
 format=     # possible values are voice, text, defaults to voice. note that voice also sends text along.
-language=   # valid values: english_uk_1, english_uk_2, english_us_1, english_us_2, deutsch_1, deutsch_2, francais, nederlands, svenska, espanol, norsk, portugues. Defaults to english_uk_1
+language=   # valid values: english_uk_1, english_uk_2, english_us_1, english_us_2, deutsch, francais, francais_2, nederlands, svenska, espanol, norsk, portugues. Defaults to english_uk_1
 interval=   # valid values are 15, 30 and 60, defaults to 30
 
 [Paths]

DStarGateway/DStarGatewayConfig.cpp

@@ -348,7 +348,7 @@ bool CDStarGatewayConfig::loadGateway(const CConfig & cfg)
 
 	std::string lang;
 	ret = cfg.getValue("gateway", "language", lang, "english_uk",
-						{"english_uk", "deutsch", "dansk", "francais", "italiano", "polski",
+						{"english_uk", "deutsch", "dansk", "francais", "francais_2", "italiano", "polski",
 						"english_us", "espanol", "svenska", "nederlands_nl", "nederlands_be", "norsk", "portugues"}) && ret;;
 	if(lang == "english_uk")		m_gateway.language = TL_ENGLISH_UK;
 	else if(lang == "deutsch")		m_gateway.language = TL_DEUTSCH;

Data/Makefile

@@ -27,6 +27,8 @@ install:
 	@install -g bin -o dstar -m 0664 es_ES.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 fr_FR.ambe $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 fr_FR.indx $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 fr_FR2.ambe $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 fr_FR2.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 it_IT.ambe $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 it_IT.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 no_NO.ambe $(DATA_DIR)

Data/fr_FR2.indx

@@ -0,0 +1,44 @@
+0	0	57
+1	57	38
+2	95	44
+3	139	41
+4	180	47
+5	227	51
+6	278	53
+7	331	47
+8	378	49
+9	427	51
+alpha	478	50
+bravo	528	52
+charlie	580	50
+delta	630	51
+A	681	37
+B	718	45
+C	763	41
+D	804	42
+E	846	45
+F	891	47
+G	938	41
+H	979	49
+I	1028	39
+J	1067	42
+K	1109	39
+L	1148	44
+M	1192	45
+N	1237	44
+O	1281	42
+P	1323	37
+Q	1360	39
+R	1399	45
+S	1444	49
+T	1493	36
+U	1529	44
+V	1573	42
+W	1615	58
+X	1673	50
+Y	1723	56
+Z	1779	50
+linkedto	1829	58
+notlinked	1887	62
+linkingto	1949	91
+isbusy	2040	61

README.md

@@ -158,6 +158,8 @@ The testing framwework used is Google Test.
 
 # 6. Version History
 ## 6.1. Version 1.0
+- [**Improvement**] Add second French voice ([#60](https://github.com/F4FXL/DStarGateway/issues/60))
+- [**Improvement**] Clarify French "Linking to" announcement ([#60](https://github.com/F4FXL/DStarGateway/issues/60))
 - [**Improvement**] Improve threading handling ([#58](https://github.com/F4FXL/DStarGateway/issues/58))
 - [**Improvement**] Add Add an option to disable logging of ircddb traffic ([#59](https://github.com/F4FXL/DStarGateway/issues/59))
 - [**Bugfix**] Fix repeater not reverting to startup reflector after issueing a command through remote control. ([#57](https://github.com/F4FXL/DStarGateway/issues/57))