Applied our style guide as someone (cough! *** Axel *** cough!) bugged me (correctly) about it :)

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11181 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-02-01 14:29:06 +00:00
parent 976f53a988
commit 422c07914d
4 changed files with 79 additions and 76 deletions
+39 -39
View File
@@ -17,22 +17,22 @@ sPropertyInfo[] = {
BChannelControl::BChannelControl(BRect frame, const char *name, const char *label,
BMessage *model, int32 channel_count, uint32 resizeMode, uint32 flags)
: BControl(frame, name, label, model, resizeMode, flags),
_m_channel_count(channel_count),
_m_value_channel(0),
_m_channel_min(NULL),
_m_channel_max(NULL),
_m_channel_val(NULL),
_m_multi_labels(NULL),
fChannelCount(channel_count),
fCurrentChannel(0),
fChannelMin(NULL),
fChannelMax(NULL),
fChannelValues(NULL),
fMultiLabels(NULL),
fModificationMsg(NULL)
{
_m_channel_min = new int32[channel_count];
memset(_m_channel_min, 0, sizeof(int32) * channel_count);
fChannelMin = new int32[channel_count];
memset(fChannelMin, 0, sizeof(int32) * channel_count);
_m_channel_max = new int32[channel_count];
memset(_m_channel_max, 100, sizeof(int32) * channel_count);
fChannelMax = new int32[channel_count];
memset(fChannelMax, 100, sizeof(int32) * channel_count);
_m_channel_val = new int32[channel_count];
memset(_m_channel_val, 0, sizeof(int32) * channel_count);
fChannelValues = new int32[channel_count];
memset(fChannelValues, 0, sizeof(int32) * channel_count);
}
@@ -44,9 +44,9 @@ BChannelControl::BChannelControl(BMessage *archive)
BChannelControl::~BChannelControl()
{
delete[] _m_channel_min;
delete[] _m_channel_max;
delete[] _m_channel_val;
delete[] fChannelMin;
delete[] fChannelMax;
delete[] fChannelValues;
}
@@ -170,14 +170,14 @@ void
BChannelControl::SetValue(int32 value)
{
// Get real
if (value > _m_channel_max[_m_value_channel])
value = _m_channel_max[_m_value_channel];
if (value > fChannelMax[fCurrentChannel])
value = fChannelMax[fCurrentChannel];
if (value < _m_channel_min[_m_value_channel]);
value = _m_channel_min[_m_value_channel];
if (value < fChannelMin[fCurrentChannel]);
value = fChannelMin[fCurrentChannel];
if (value != _m_channel_val[_m_value_channel]) {
StuffValues(_m_value_channel, 1, &value);
if (value != fChannelValues[fCurrentChannel]) {
StuffValues(fCurrentChannel, 1, &value);
BControl::SetValue(value);
}
}
@@ -186,12 +186,12 @@ BChannelControl::SetValue(int32 value)
status_t
BChannelControl::SetCurrentChannel(int32 channel)
{
if (channel < 0 || channel >= _m_channel_count)
if (channel < 0 || channel >= fChannelCount)
return B_BAD_INDEX;
if (channel != _m_value_channel) {
_m_value_channel = channel;
BControl::SetValue(_m_channel_val[_m_value_channel]);
if (channel != fCurrentChannel) {
fCurrentChannel = channel;
BControl::SetValue(fChannelValues[fCurrentChannel]);
}
return B_OK;
@@ -201,14 +201,14 @@ BChannelControl::SetCurrentChannel(int32 channel)
int32
BChannelControl::CurrentChannel() const
{
return _m_value_channel;
return fCurrentChannel;
}
int32
BChannelControl::CountChannels() const
{
return _m_channel_count;
return fChannelCount;
}
@@ -219,25 +219,25 @@ BChannelControl::SetChannelCount(int32 channel_count)
return B_BAD_VALUE;
// TODO: Currently we only grow the buffer. Test what BeOS does
if (channel_count > _m_channel_count) {
if (channel_count > fChannelCount) {
int32 *newMin = new int32[channel_count];
int32 *newMax = new int32[channel_count];
int32 *newVal = new int32[channel_count];
memcpy(newMin, _m_channel_min, _m_channel_count);
memcpy(newMax, _m_channel_max, _m_channel_count);
memcpy(newVal, _m_channel_val, _m_channel_count);
memcpy(newMin, fChannelMin, fChannelCount);
memcpy(newMax, fChannelMax, fChannelCount);
memcpy(newVal, fChannelValues, fChannelCount);
delete[] _m_channel_min;
delete[] _m_channel_max;
delete[] _m_channel_val;
delete[] fChannelMin;
delete[] fChannelMax;
delete[] fChannelValues;
_m_channel_min = newMin;
_m_channel_max = newMax;
_m_channel_val = newVal;
fChannelMin = newMin;
fChannelMax = newMax;
fChannelValues = newVal;
}
_m_channel_count = channel_count;
fChannelCount = channel_count;
return B_OK;
}
@@ -260,7 +260,7 @@ BChannelControl::GetValue(int32 *outValues, int32 fromChannel,
{
int32 i = 0;
for (i = 0; i < channelCount; i++)
outValues[i] = _m_channel_val[fromChannel + i];
outValues[i] = fChannelValues[fromChannel + i];
return i;
}