From 3d8b4bab1f2be1cbe8fb4a9e7cf9bd2cb7b367b0 Mon Sep 17 00:00:00 2001
From: Marcus Overhagen <marcusoverhagen@gmail.com>
Date: Mon, 8 May 2006 20:57:04 +0000
Subject: [PATCH] Did some renaming, Changed* is now used when the user
 modifies the controls.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17376 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/mediaplayer/ControllerView.cpp       |  8 ++---
 src/apps/mediaplayer/ControllerView.h         |  4 +--
 .../mediaplayer/TransportControlGroup.cpp     | 29 ++++++++++++++-----
 src/apps/mediaplayer/TransportControlGroup.h  |  9 ++++--
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/apps/mediaplayer/ControllerView.cpp b/src/apps/mediaplayer/ControllerView.cpp
index a8eae38628..303864b4b9 100644
--- a/src/apps/mediaplayer/ControllerView.cpp
+++ b/src/apps/mediaplayer/ControllerView.cpp
@@ -133,9 +133,9 @@ ControllerView::SkipForward()
 
 
 void
-ControllerView::SetVolume(float value)
+ControllerView::VolumeChanged(float value)
 {
-	printf("ControllerView::SetVolume(%.4f)\n", value);
+	printf("ControllerView::VolumeChanged(%.4f)\n", value);
 	fController->SetVolume(value);
 }
 
@@ -148,9 +148,9 @@ ControllerView::ToggleMute()
 
 
 void
-ControllerView::SetPosition(float value)
+ControllerView::PositionChanged(float value)
 {
-	printf("ControllerView::SetPosition(%.2f)\n", value);
+	printf("ControllerView::PositionChanged(%.2f)\n", value);
 	// 0.0 ... 1.0
 }
 
diff --git a/src/apps/mediaplayer/ControllerView.h b/src/apps/mediaplayer/ControllerView.h
index 6e125c6235..65a6052a1a 100644
--- a/src/apps/mediaplayer/ControllerView.h
+++ b/src/apps/mediaplayer/ControllerView.h
@@ -47,9 +47,9 @@ private:
 	virtual	void	Forward();
 	virtual	void	SkipBackward();
 	virtual	void	SkipForward();
-	virtual	void	SetVolume(float value);
+	virtual	void	VolumeChanged(float value);
 	virtual	void	ToggleMute();
-	virtual	void	SetPosition(float value);
+	virtual	void	PositionChanged(float value);
 	
 private:
 	Controller *	fController;
diff --git a/src/apps/mediaplayer/TransportControlGroup.cpp b/src/apps/mediaplayer/TransportControlGroup.cpp
index 0c8898eff2..9db616e66d 100644
--- a/src/apps/mediaplayer/TransportControlGroup.cpp
+++ b/src/apps/mediaplayer/TransportControlGroup.cpp
@@ -231,7 +231,7 @@ TransportControlGroup::MessageReceived(BMessage* message)
 			break;
 
 		case MSG_SET_VOLUME:
-			_SetVolume();
+			_UpdateVolume();
 			break;
 		case MSG_SET_MUTE:
 			_ToggleMute();
@@ -257,9 +257,9 @@ void TransportControlGroup::Rewind()					{}
 void TransportControlGroup::Forward()					{}
 void TransportControlGroup::SkipBackward()				{}
 void TransportControlGroup::SkipForward()				{}
-void TransportControlGroup::SetVolume(float value)		{}
+void TransportControlGroup::VolumeChanged(float value)	{}
 void TransportControlGroup::ToggleMute()				{}
-void TransportControlGroup::SetPosition(float value)	{}
+void TransportControlGroup::PositionChanged(float value){}
 
 // #pragma mark -
 
@@ -379,6 +379,20 @@ TransportControlGroup::SetMuted(bool mute)
 }
 
 
+void
+TransportControlGroup::SetVolume(float value)
+{
+	fVolumeSlider->SetValue(_DbToGain(_ExponentialToLinear(_GainToDb(value))) * kVolumeFactor);
+}
+
+
+void
+TransportControlGroup::SetPosition(float value)
+{
+	fSeekSlider->SetPosition(value);
+}
+
+
 // #pragma mark -
 
 // _LayoutControls
@@ -525,15 +539,14 @@ TransportControlGroup::_SkipForward()
 	SkipForward();
 }
 
-// _SetVolume
 void
-TransportControlGroup::_SetVolume()
+TransportControlGroup::_UpdateVolume()
 {
 	float pos = fVolumeSlider->Value() / (float)kVolumeFactor;
 	float db = _ExponentialToLinear(_GainToDb(pos));
 	float gain = _DbToGain(db);
 	printf("_SetVolume: pos %.4f, db %.4f, gain %.4f\n", pos, db, gain);
-	SetVolume(gain);
+	VolumeChanged(gain);
 }
 
 // _ToggleMute
@@ -544,11 +557,11 @@ TransportControlGroup::_ToggleMute()
 	ToggleMute();
 }
 
-// _UpdatePosition
+
 void
 TransportControlGroup::_UpdatePosition()
 {
-	SetPosition(fSeekSlider->Value() / (float)kPositionFactor);
+	PositionChanged(fSeekSlider->Value() / (float)kPositionFactor);
 }
 
 
diff --git a/src/apps/mediaplayer/TransportControlGroup.h b/src/apps/mediaplayer/TransportControlGroup.h
index ff1f3014e6..0f1b880114 100644
--- a/src/apps/mediaplayer/TransportControlGroup.h
+++ b/src/apps/mediaplayer/TransportControlGroup.h
@@ -55,9 +55,9 @@ class TransportControlGroup : public BView {
 	virtual	void				Forward();
 	virtual	void				SkipBackward();
 	virtual	void				SkipForward();
-	virtual	void				SetVolume(float value);
+	virtual	void				VolumeChanged(float value);
 	virtual	void				ToggleMute();
-	virtual	void				SetPosition(float value);
+	virtual	void				PositionChanged(float value);
 
 			void				SetEnabled(uint32 whichButtons);
 
@@ -68,6 +68,9 @@ class TransportControlGroup : public BView {
 			void				SetAudioEnabled(bool enable);
 			void				SetMuted(bool mute);
 
+			void				SetVolume(float value);
+			void				SetPosition(float value);
+
  private:
 			void				_LayoutControls(BRect frame) const;
 			BRect				_MinFrame() const;
@@ -82,7 +85,7 @@ class TransportControlGroup : public BView {
 			void				_Forward();
 			void				_SkipBackward();
 			void				_SkipForward();
-			void				_SetVolume();
+			void				_UpdateVolume();
 			void				_ToggleMute();
 			void				_UpdatePosition();