--- qsampler/trunk/src/qsamplerChannelStrip.ui.h 2004/06/05 11:37:06 109 +++ qsampler/trunk/src/qsamplerChannelStrip.ui.h 2004/06/14 21:05:20 127 @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -49,7 +50,7 @@ m_iMidiChannel = 0; m_sAudioDriver = "ALSA"; // DEPRECATED. m_iAudioDevice = 0; - m_fVolume = 0.0; + m_fVolume = 0.8; m_iDirtyChange = 0; @@ -407,9 +408,7 @@ #endif // And clip... - if (iVolume > 100) - iVolume = 100; - else if (iVolume < 0) + if (iVolume < 0) iVolume = 0; // Flag it here, to avoid infinite recursion. @@ -458,9 +457,7 @@ // Convert and clip. float fVolume = (float) iVolume / 100.0; - if (fVolume > 1.0) - fVolume = 1.0; - else if (fVolume < 0.0) + if (fVolume < 0.001) fVolume = 0.0; // Update the GUI elements. @@ -498,5 +495,23 @@ } +// Context menu event handler. +void qsamplerChannelStrip::contextMenuEvent( QContextMenuEvent *pEvent ) +{ + // We'll just show up the main form's edit menu. + m_pMainForm->contextMenuEvent(pEvent); +} + + +// Maximum volume slider accessors. +void qsamplerChannelStrip::setMaxVolume ( int iMaxVolume ) +{ + m_iDirtyChange++; + VolumeSlider->setRange(0, iMaxVolume); + VolumeSpinBox->setRange(0, iMaxVolume); + m_iDirtyChange--; +} + + // end of qsamplerChannelStrip.ui.h