From 7fe3952c5d5977385843892e6726d0d7aaf58157 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Mon, 26 Aug 2019 14:11:38 -0400
Subject: [PATCH] 2019-08-26 Fred Gleason <fredg@paravelsystems.com> 	*
 Reimplemented the '--asoundrc-file=' directive in 	rdalsaconfig(8).

---
 ChangeLog                           |  3 +++
 utils/rdalsaconfig/rdalsaconfig.cpp | 14 +++++++-------
 utils/rdalsaconfig/rdalsaconfig.h   |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 791c46ec..5390080e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18956,3 +18956,6 @@
 2019-08-26 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rdalsaconfig(8) that caused a 'Service not
 	active' error to be generated at startup.
+2019-08-26 Fred Gleason <fredg@paravelsystems.com>
+	* Reimplemented the '--asoundrc-file=' directive in
+	rdalsaconfig(8).
diff --git a/utils/rdalsaconfig/rdalsaconfig.cpp b/utils/rdalsaconfig/rdalsaconfig.cpp
index 7c2ea346..b4e35c21 100644
--- a/utils/rdalsaconfig/rdalsaconfig.cpp
+++ b/utils/rdalsaconfig/rdalsaconfig.cpp
@@ -136,7 +136,7 @@ MainWidget::MainWidget(QWidget *parent)
   //
   alsa_system_model=new RDAlsaModel(rda->system()->sampleRate(),this);
   alsa_system_list->setModel(alsa_system_model);
-  LoadConfig();
+  LoadConfig(alsa_filename);
 
   //
   // Daemon Management
@@ -199,7 +199,7 @@ void MainWidget::saveData()
   StartDaemons();
   */
 
-  SaveConfig();
+  SaveConfig(alsa_filename);
 
   qApp->quit();
 }
@@ -246,7 +246,7 @@ void MainWidget::closeEvent(QCloseEvent *e)
 }
 
 
-void MainWidget::LoadConfig()
+void MainWidget::LoadConfig(const QString &filename)
 {
   FILE *f=NULL;
   char line[1024];
@@ -258,7 +258,7 @@ void MainWidget::LoadConfig()
   bool active_line=false;
   QModelIndex index;
 
-  if((f=fopen(RD_ASOUNDRC_FILE,"r"))==NULL) {
+  if((f=fopen(filename.toUtf8(),"r"))==NULL) {
     return;
   }
   while(fgets(line,1024,f)!=NULL) {
@@ -330,9 +330,9 @@ void MainWidget::LoadConfig()
 }
 
 
-void MainWidget::SaveConfig() const
+void MainWidget::SaveConfig(const QString &filename) const
 {
-  QString tempfile=QString(RD_ASOUNDRC_FILE)+"-temp";
+  QString tempfile=filename+"-temp";
   FILE *f=NULL;
 
   if((f=fopen(tempfile.toUtf8(),"w"))==NULL) {
@@ -363,7 +363,7 @@ void MainWidget::SaveConfig() const
   fprintf(f,"%s\n",END_MARKER);
 
   fclose(f);
-  rename(tempfile.toUtf8(),RD_ASOUNDRC_FILE);
+  rename(tempfile.toUtf8(),filename.toUtf8());
 }
 
 
diff --git a/utils/rdalsaconfig/rdalsaconfig.h b/utils/rdalsaconfig/rdalsaconfig.h
index 84e21bcb..c3826039 100644
--- a/utils/rdalsaconfig/rdalsaconfig.h
+++ b/utils/rdalsaconfig/rdalsaconfig.h
@@ -53,8 +53,8 @@ class MainWidget : public QWidget
   void closeEvent(QCloseEvent *e);
 
  private:
-  void LoadConfig();
-  void SaveConfig() const;
+  void LoadConfig(const QString &filename);
+  void SaveConfig(const QString &filename) const;
   QLabel *alsa_system_label;
   QLabel *alsa_description_label;
   QListView *alsa_system_list;