Completed storing the current audio volume in the setup.conf file

5 files changed, 14 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3a04af16..a3bc9f53 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -150,3 +150,6 @@ Andreas Share <a.share@t-online.de>
 
 Simon Bauschulte <SemiSchwabe@Brutzel.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Andy Grobb <Charly98@01019freenet.de>
+ for completing storing the current audio volume in the setup.conf file
diff --git a/HISTORY b/HISTORY
index 5087c9ef..1ed3d4b2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -830,3 +830,8 @@ Video Disk Recorder Revision History
   values.
 - Fixed handling trick modes near the beginning and end of a recording.
 - Pressing the "Back" button while replaying a DVD now leads to the DVD menu.
+
+2001-10-27: Version 0.98
+
+- Completed storing the current audio volume in the setup.conf file (thanks
+  to Andy Grobb).
diff --git a/config.h b/config.h
index d0f0d77f..57449693 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.84 2001/10/07 15:13:23 kls Exp $
+ * $Id: config.h 1.85 2001/10/27 09:56:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.97"
+#define VDRVERSION "0.98"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbapi.h b/dvbapi.h
index 8e67f9b4..725060f8 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.53 2001/09/23 11:01:46 kls Exp $
+ * $Id: dvbapi.h 1.54 2001/10/27 09:50:03 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -330,6 +330,7 @@ public:
   void SetVolume(int Volume, bool Absolute = false);
        // Sets the volume to the given value, either absolutely or relative to
        // the current volume.
+  static int CurrentVolume(void) { return PrimaryDvbApi ? PrimaryDvbApi->volume : 0; }
   };
 
 class cEITScanner {
diff --git a/vdr.c b/vdr.c
index ce86fd0d..287fe64f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.86 2001/10/20 11:18:38 kls Exp $
+ * $Id: vdr.c 1.87 2001/10/27 09:47:02 kls Exp $
  */
 
 #include <getopt.h>
@@ -529,6 +529,7 @@ int main(int argc, char *argv[])
   if (Interrupted)
      isyslog(LOG_INFO, "caught signal %d", Interrupted);
   Setup.CurrentChannel = cDvbApi::CurrentChannel();
+  Setup.CurrentVolume  = cDvbApi::CurrentVolume();
   Setup.Save();
   cVideoCutter::Stop();
   delete Menu;