mic setting

AudioInput.cpp

@@ -11,7 +11,7 @@ bool AudioInput::createAudioInputDevice(int SampleRate, unsigned int bufferFrame
 	{
 		string s = Settings_file.find_audio("device");
 		audio_input->open(s);
-		audio_input->set_volume(Settings_file.micgain());
+		audio_input->set_volume(Settings_file.get_int("Radio", "micgain", 85));
 		return true;
 	}
 	fprintf(stderr, "ERROR: Cannot create AudioInputDevice\n");

Settings.cpp

@@ -375,28 +375,6 @@ void Settings::set_gain(int gain)
 		return;
 }
 
-int Settings::micgain()
-{
-	if (radio.find("micgain") != radio.end())
-	{
-		auto s = radio.find("micgain");
-		return atoi((const char *)s->second.c_str());
-	}
-	else 
-		return 0;
-}
-
-void Settings::set_micgain(int gain)
-{
-	if (radio.find("micgain") != radio.end())
-	{
-		auto s = radio.find("micgain");
-		s->second = to_string(gain);
-		return;
-	}
-	else 
-		return;
-}
 
 int Settings::drive()
 {

Settings.h

@@ -26,12 +26,10 @@ class Settings
 	int volume();
 	int gain();
 	int txgain();
-	int micgain();
 	int drive();
 	int getagc(string key);
 	int getspeech(string key);
 	void set_drive(int drive);
-	void set_micgain(int gain);
 	void set_txgain(int gain);
 	void set_gain(int gain);
 	string find_input(string key);

gui_tx.cpp

@@ -116,7 +116,7 @@ void gui_tx::gui_tx_init(lv_obj_t* o_tab, lv_coord_t w)
 	lv_obj_add_event_cb(mic_slider, mic_slider_event_cb, LV_EVENT_VALUE_CHANGED, (void*)this);
 	mic_slider_label = lv_label_create(o_tab);
 	lv_obj_align_to(mic_slider_label, mic_slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
-	set_mic_slider(Settings_file.micgain());
+	set_mic_slider(Settings_file.get_int("Radio", "micgain", 85));
 	lv_group_add_obj(m_button_group, mic_slider);
 
 	drv_slider = lv_slider_create(o_tab);
@@ -154,13 +154,8 @@ void gui_tx::mic_slider_event_cb_class(lv_event_t * e)
 	lv_obj_align_to(mic_slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
 	if (audio_input != nullptr)
 		audio_input->set_volume(lv_slider_get_value(slider));
-	Settings_file.set_micgain(lv_slider_get_value(slider));
-}
-
-void gui_tx::step_mic_slider(int step)
-{
-	set_mic_slider(lv_slider_get_value(mic_slider) + step);
-	Settings_file.set_micgain(lv_slider_get_value(mic_slider));
+	Settings_file.save_int("Radio", "micgain", lv_slider_get_value(slider));
+	Settings_file.write_settings();
 }
 
 void gui_tx::set_mic_slider(int volume)

gui_tx.h

@@ -28,7 +28,6 @@ class gui_tx
   public:
 	void gui_tx_init(lv_obj_t *o_tab, lv_coord_t w);
 	void set_mic_slider(int volume);
-	void step_mic_slider(int step);
 	void set_drv_slider(int drive);
 	void set_tx_state(bool state);
 	void set_drv_range();

sdrberry.cpp

@@ -1009,7 +1009,7 @@ void switch_sdrreceiver(std::string receiver)
 				lv_btnmatrix_clear_btn_ctrl(tab_buttons, hidetx, LV_BTNMATRIX_CTRL_HIDDEN);
 				Gui_tx.clear_sample_rate();
 				Gui_tx.set_drv_range();
-				Gui_tx.set_mic_slider(Settings_file.micgain());
+				Gui_tx.set_mic_slider(Settings_file.get_int("Radio", "micgain", 85));
 				for (auto &col : SdrDevices.SdrDevices.at(default_radio)->get_tx_sample_rates(default_tx_channel))
 				{
 					int v = (int)col;