Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented Get/SetLimits() and fixed scripting stuff

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11620 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2005-03-08 14:52:43 +00:00
parent 7f67a70cfe
commit 7730601a59
2 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/kits/interface/ChannelControl.cpp
View File

@ -8,9 +8,25 @@
#include <PropertyInfo.h> #include <PropertyInfo.h>
static property_info // TODO: Finish this static property_info
sPropertyInfo[] = { sPropertyInfo[] = {
{0} { "ChannelCount",
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "", 0 },
{ "CurrentChannel",
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "", 0 },
{ "MaxLimitLabel",
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "", 0 },
{ "MinLimitLabel",
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "", 0 },
{ 0 }
}; };
@ -430,6 +446,28 @@ BChannelControl::GetLimitsFor(int32 fromChannel, int32 channelCount,
status_t status_t
BChannelControl::SetLimits(int32 minimum, int32 maximum) BChannelControl::SetLimits(int32 minimum, int32 maximum)
{ {
if (minimum > maximum)
return B_BAD_VALUE;
int32 numChannels = CountChannels();
int32 *newMinLimits = new int32[numChannels];
int32 *newMaxLimits = new int32[numChannels];
for (int32 c = 0; c < numChannels; c++) {
newMinLimits[c] = minimum;
newMaxLimits[c] = maximum;
if (fChannelValues[c] < newMinLimits[c])
fChannelValues[c] = newMinLimits[c];
else if (fChannelValues[c] > newMaxLimits[c])
fChannelValues[c] = newMaxLimits[c];
}
delete[] fChannelMin;
delete[] fChannelMax;
fChannelMin = newMinLimits;
fChannelMax = newMaxLimits;
return B_ERROR; return B_ERROR;
} }
@ -437,7 +475,19 @@ BChannelControl::SetLimits(int32 minimum, int32 maximum)
status_t status_t
BChannelControl::GetLimits(int32 *outMinimum, int32 *outMaximum) const BChannelControl::GetLimits(int32 *outMinimum, int32 *outMaximum) const
{ {
if (outMinimum == NULL || outMaximum == NULL)
return B_BAD_VALUE;
if (fChannelMin == NULL || fChannelMax == NULL)
return B_ERROR; return B_ERROR;
int32 numChannels = CountChannels();
for (int32 c = 0; c < numChannels; c++) {
outMinimum[c] = fChannelMin[c];
outMaximum[c] = fChannelMax[c];
}
return B_OK;
} }

10
src/kits/interface/ChannelSlider.cpp
View File

@ -54,15 +54,7 @@ sPropertyInfo[] = {
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 }, { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "" }, { B_DIRECT_SPECIFIER, 0 }, "" },
{ "ChannelCount", { 0 }
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "" },
{ "CurrentChannel",
{ B_GET_PROPERTY, B_SET_PROPERTY, 0 },
{ B_DIRECT_SPECIFIER, 0 }, "" },
{0}
}; };