From b04c7f18a75e854be46aadd48e124e15c59e6ca7 Mon Sep 17 00:00:00 2001
From: martynshaw99 <martynshaw99@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sun, 17 Mar 2013 23:33:28 +0000
Subject: [PATCH] Steve's fix for bug/enhancement 74.

---
 src/toolbars/MixerToolBar.cpp | 15 +++++++++++----
 src/toolbars/MixerToolBar.h   |  4 ++++
 src/widgets/ASlider.cpp       |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp
index 01e8b101f..cc0c28f66 100644
--- a/src/toolbars/MixerToolBar.cpp
+++ b/src/toolbars/MixerToolBar.cpp
@@ -123,7 +123,6 @@ void MixerToolBar::Populate()
                  this);
    // Show or hide the input slider based on whether it works
    mInputSlider->Enable(gAudioIO->InputMixerWorks());
-   SetToolTips();
 
    UpdateControls();
 
@@ -181,7 +180,6 @@ void MixerToolBar::UpdatePrefs()
 
    // Show or hide the input slider based on whether it works
    mInputSlider->Enable(gAudioIO->InputMixerWorks());
-   SetToolTips();
 
    // Layout the toolbar
    Layout();
@@ -218,10 +216,14 @@ void MixerToolBar::UpdateControls()
 
    if (mOutputSlider->Get() != playbackVolume) {
       mOutputSlider->Set(playbackVolume);
+      mOutputSliderVolume = playbackVolume;
+      SetToolTips();
    }
 
    if (mInputSlider->Get() != inputVolume) {
       mInputSlider->Set(inputVolume);
+      mInputSliderVolume = inputVolume;
+      SetToolTips();
    }
 #endif // USE_PORTMIXER
 }
@@ -236,6 +238,9 @@ void MixerToolBar::SetMixer(wxCommandEvent &event)
 
    gAudioIO->GetMixer(&inputSource, &oldIn, &oldOut);
    gAudioIO->SetMixer(inputSource, inputVolume, outputVolume);
+   mOutputSliderVolume = outputVolume;
+   mInputSliderVolume = inputVolume;
+   SetToolTips();
 #endif // USE_PORTMIXER
 }
 
@@ -285,7 +290,8 @@ void MixerToolBar::SetToolTips()
 {
 #if wxUSE_TOOLTIPS
    if (mInputSlider->IsEnabled()) {
-      mInputSlider->SetToolTip(_("Input Volume"));
+      mInputSlider->SetToolTip(wxString::Format(
+            _("Input Volume: %.2f"), mInputSliderVolume));
    }
    else {
       mInputSlider->SetToolTip(
@@ -293,7 +299,8 @@ void MixerToolBar::SetToolTips()
    }
 
    if (mOutputSlider->IsEnabled()) {
-      mOutputSlider->SetToolTip(_("Output Volume"));
+      mOutputSlider->SetToolTip(wxString::Format(
+            _("Output Volume: %.2f"), mOutputSliderVolume));
    }
    else {
       mOutputSlider->SetToolTip(
diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h
index 3c8c80a87..10474a4f8 100644
--- a/src/toolbars/MixerToolBar.h
+++ b/src/toolbars/MixerToolBar.h
@@ -50,6 +50,10 @@ class MixerToolBar:public ToolBar {
    void AdjustOutputGain(int adj);
    void AdjustInputGain(int adj);
 
+ protected:
+   float mInputSliderVolume;
+   float mOutputSliderVolume;
+
  private:
 
    void InitializeMixerToolBar();
diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp
index f8cd67d0f..67d95a2a1 100644
--- a/src/widgets/ASlider.cpp
+++ b/src/widgets/ASlider.cpp
@@ -897,7 +897,7 @@ void LWSlider::FormatPopWin()
 
    switch(mStyle) {
    case FRAC_SLIDER:
-      label.Printf(wxT("%s: %.1f"), mName.c_str(), mCurrentValue);
+      label.Printf(wxT("%s: %.2f"), mName.c_str(), mCurrentValue);
       break;
      
    case DB_SLIDER: