From fd873802ab24e15b84f9dc3ae7bcffd86b57ab72 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Wed, 2 Feb 2005 09:34:06 +0000
Subject: [PATCH] Implemented some more BChannelControl methods. It's almost
 fully functional. BChannelSlider won't crash if ThumbFor() returns NULL.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11211 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/ChannelControl.cpp | 53 +++++++++++++++++++++++----
 src/kits/interface/ChannelSlider.cpp  |  7 +++-
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/kits/interface/ChannelControl.cpp b/src/kits/interface/ChannelControl.cpp
index d811d77d77..748a8de753 100644
--- a/src/kits/interface/ChannelControl.cpp
+++ b/src/kits/interface/ChannelControl.cpp
@@ -142,7 +142,17 @@ BChannelControl::ModificationMessage() const
 status_t
 BChannelControl::Invoke(BMessage *msg)
 {
-	return B_ERROR;
+	bool notify = false;
+	BMessage invokeMessage(InvokeKind(&notify));
+
+	if (msg != NULL)
+		invokeMessage = *msg;
+	else if (Message() != NULL)
+		invokeMessage = *Message();
+	
+	invokeMessage.AddInt32("be:current_channel", fCurrentChannel);
+
+	return BControl::Invoke(&invokeMessage);
 }
 
 
@@ -291,14 +301,14 @@ BChannelControl::SetAllValue(int32 values)
 status_t
 BChannelControl::SetLimitsFor(int32 channel, int32 minimum, int32 maximum)
 {
-	return B_ERROR;
+	return SetLimitsFor(channel, 1, &minimum, &maximum);
 }
 
 
 status_t
 BChannelControl::GetLimitsFor(int32 channel, int32 *minimum, int32 *maximum) const
 {
-	return B_ERROR;
+	return GetLimitsFor(channel, 1, minimum, maximum);
 }
 
 
@@ -306,6 +316,7 @@ status_t
 BChannelControl::SetLimitsFor(int32 fromChannel, int32 channelCount,
 	const int32 *minimum, const int32 *maximum)
 {
+	
 	return B_ERROR;
 }
 
@@ -333,23 +344,31 @@ BChannelControl::GetLimits(int32 *outMinimum, int32 *outMaximum) const
 
 
 status_t
-BChannelControl::SetLimitLabels(const char *min_label, const char *max_label)
+BChannelControl::SetLimitLabels(const char *minLabel, const char *maxLabel)
 {
-	return B_ERROR;
+	if (minLabel != fMinLabel)
+		fMinLabel = minLabel;
+	
+	if (maxLabel != fMaxLabel)
+		fMaxLabel = maxLabel;
+
+	Invalidate();
+
+	return B_OK;
 }
 
 
 const char *
 BChannelControl::MinLimitLabel() const
 {
-	return NULL;
+	return fMinLabel.String();
 }
 
 
 const char *
 BChannelControl::MaxLimitLabel() const
 {
-	return NULL;
+	return fMaxLabel.String();
 }
 
 
@@ -385,7 +404,25 @@ status_t
 BChannelControl::StuffValues(int32 fromChannel, int32 channelCount,
 	const int32 *inValues)
 {
-	return B_ERROR;
+	if (inValues == NULL)
+		return B_BAD_VALUE;
+
+	if (fromChannel < 0 || fromChannel >= fChannelCount
+						|| fromChannel + channelCount >= fChannelCount)
+		return B_BAD_INDEX;
+
+	for (int32 i = 0; i < channelCount; i++) {	
+		if (inValues[i] <= fChannelMax[fromChannel + i] 
+						&& inValues[i] >= fChannelMin[fromChannel + i])
+			fChannelValues[fromChannel + i] = inValues[i];
+		
+	}
+
+	// If the current channel was updated, update also the control value
+	if (fCurrentChannel >= fromChannel && fCurrentChannel <= fromChannel + channelCount)
+		BControl::SetValue(fChannelValues[fCurrentChannel]);
+
+	return B_OK;
 }
 
 
diff --git a/src/kits/interface/ChannelSlider.cpp b/src/kits/interface/ChannelSlider.cpp
index 83473ae741..deb7eee56a 100644
--- a/src/kits/interface/ChannelSlider.cpp
+++ b/src/kits/interface/ChannelSlider.cpp
@@ -79,7 +79,7 @@ BChannelSlider::Archive(BMessage *into, bool deep) const
 orientation
 BChannelSlider::Orientation() const
 {
-	return fVertical ? B_VERTICAL : B_HORIZONTAL;
+	return Vertical() ? B_VERTICAL : B_HORIZONTAL;
 }
 
 
@@ -291,7 +291,9 @@ BChannelSlider::DrawThumb(BView *into, int32 channel, BPoint where, bool pressed
 	ASSERT(into != NULL);
 		
 	const BBitmap *thumb = ThumbFor(channel, pressed);
-	
+	if (thumb == NULL)
+		return;
+
 	BRect bitmapBounds = thumb->Bounds();
 	where.x -= bitmapBounds.right / 2;
 	where.y -= bitmapBounds.bottom / 2;
@@ -397,6 +399,7 @@ BChannelSlider::InitData()
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
 	// TODO: Set initial values ?
+	// actually, looks like initial values are set on MouseDown()/MouseMoved()
 }