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
This commit is contained in:
@@ -133,9 +133,9 @@ ControllerView::SkipForward()
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ControllerView::SetVolume(float value)
|
ControllerView::VolumeChanged(float value)
|
||||||
{
|
{
|
||||||
printf("ControllerView::SetVolume(%.4f)\n", value);
|
printf("ControllerView::VolumeChanged(%.4f)\n", value);
|
||||||
fController->SetVolume(value);
|
fController->SetVolume(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,9 +148,9 @@ ControllerView::ToggleMute()
|
|||||||
|
|
||||||
|
|
||||||
void
|
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
|
// 0.0 ... 1.0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ private:
|
|||||||
virtual void Forward();
|
virtual void Forward();
|
||||||
virtual void SkipBackward();
|
virtual void SkipBackward();
|
||||||
virtual void SkipForward();
|
virtual void SkipForward();
|
||||||
virtual void SetVolume(float value);
|
virtual void VolumeChanged(float value);
|
||||||
virtual void ToggleMute();
|
virtual void ToggleMute();
|
||||||
virtual void SetPosition(float value);
|
virtual void PositionChanged(float value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Controller * fController;
|
Controller * fController;
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ TransportControlGroup::MessageReceived(BMessage* message)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MSG_SET_VOLUME:
|
case MSG_SET_VOLUME:
|
||||||
_SetVolume();
|
_UpdateVolume();
|
||||||
break;
|
break;
|
||||||
case MSG_SET_MUTE:
|
case MSG_SET_MUTE:
|
||||||
_ToggleMute();
|
_ToggleMute();
|
||||||
@@ -257,9 +257,9 @@ void TransportControlGroup::Rewind() {}
|
|||||||
void TransportControlGroup::Forward() {}
|
void TransportControlGroup::Forward() {}
|
||||||
void TransportControlGroup::SkipBackward() {}
|
void TransportControlGroup::SkipBackward() {}
|
||||||
void TransportControlGroup::SkipForward() {}
|
void TransportControlGroup::SkipForward() {}
|
||||||
void TransportControlGroup::SetVolume(float value) {}
|
void TransportControlGroup::VolumeChanged(float value) {}
|
||||||
void TransportControlGroup::ToggleMute() {}
|
void TransportControlGroup::ToggleMute() {}
|
||||||
void TransportControlGroup::SetPosition(float value) {}
|
void TransportControlGroup::PositionChanged(float value){}
|
||||||
|
|
||||||
// #pragma mark -
|
// #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 -
|
// #pragma mark -
|
||||||
|
|
||||||
// _LayoutControls
|
// _LayoutControls
|
||||||
@@ -525,15 +539,14 @@ TransportControlGroup::_SkipForward()
|
|||||||
SkipForward();
|
SkipForward();
|
||||||
}
|
}
|
||||||
|
|
||||||
// _SetVolume
|
|
||||||
void
|
void
|
||||||
TransportControlGroup::_SetVolume()
|
TransportControlGroup::_UpdateVolume()
|
||||||
{
|
{
|
||||||
float pos = fVolumeSlider->Value() / (float)kVolumeFactor;
|
float pos = fVolumeSlider->Value() / (float)kVolumeFactor;
|
||||||
float db = _ExponentialToLinear(_GainToDb(pos));
|
float db = _ExponentialToLinear(_GainToDb(pos));
|
||||||
float gain = _DbToGain(db);
|
float gain = _DbToGain(db);
|
||||||
printf("_SetVolume: pos %.4f, db %.4f, gain %.4f\n", pos, db, gain);
|
printf("_SetVolume: pos %.4f, db %.4f, gain %.4f\n", pos, db, gain);
|
||||||
SetVolume(gain);
|
VolumeChanged(gain);
|
||||||
}
|
}
|
||||||
|
|
||||||
// _ToggleMute
|
// _ToggleMute
|
||||||
@@ -544,11 +557,11 @@ TransportControlGroup::_ToggleMute()
|
|||||||
ToggleMute();
|
ToggleMute();
|
||||||
}
|
}
|
||||||
|
|
||||||
// _UpdatePosition
|
|
||||||
void
|
void
|
||||||
TransportControlGroup::_UpdatePosition()
|
TransportControlGroup::_UpdatePosition()
|
||||||
{
|
{
|
||||||
SetPosition(fSeekSlider->Value() / (float)kPositionFactor);
|
PositionChanged(fSeekSlider->Value() / (float)kPositionFactor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -55,9 +55,9 @@ class TransportControlGroup : public BView {
|
|||||||
virtual void Forward();
|
virtual void Forward();
|
||||||
virtual void SkipBackward();
|
virtual void SkipBackward();
|
||||||
virtual void SkipForward();
|
virtual void SkipForward();
|
||||||
virtual void SetVolume(float value);
|
virtual void VolumeChanged(float value);
|
||||||
virtual void ToggleMute();
|
virtual void ToggleMute();
|
||||||
virtual void SetPosition(float value);
|
virtual void PositionChanged(float value);
|
||||||
|
|
||||||
void SetEnabled(uint32 whichButtons);
|
void SetEnabled(uint32 whichButtons);
|
||||||
|
|
||||||
@@ -68,6 +68,9 @@ class TransportControlGroup : public BView {
|
|||||||
void SetAudioEnabled(bool enable);
|
void SetAudioEnabled(bool enable);
|
||||||
void SetMuted(bool mute);
|
void SetMuted(bool mute);
|
||||||
|
|
||||||
|
void SetVolume(float value);
|
||||||
|
void SetPosition(float value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _LayoutControls(BRect frame) const;
|
void _LayoutControls(BRect frame) const;
|
||||||
BRect _MinFrame() const;
|
BRect _MinFrame() const;
|
||||||
@@ -82,7 +85,7 @@ class TransportControlGroup : public BView {
|
|||||||
void _Forward();
|
void _Forward();
|
||||||
void _SkipBackward();
|
void _SkipBackward();
|
||||||
void _SkipForward();
|
void _SkipForward();
|
||||||
void _SetVolume();
|
void _UpdateVolume();
|
||||||
void _ToggleMute();
|
void _ToggleMute();
|
||||||
void _UpdatePosition();
|
void _UpdatePosition();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user