--- qsampler/trunk/src/qsamplerChannelForm.ui 2005/03/14 12:59:27 455 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2005/08/28 00:31:34 758 @@ -28,8 +28,8 @@ 0 0 - 455 - 303 + 508 + 445 @@ -41,7 +41,7 @@ - Channel + Qsampler: Channel qsamplerChannel.png @@ -53,7 +53,7 @@ unnamed - + EngineNameComboBox @@ -73,14 +73,6 @@ EngineNameTextLabel - - - 1 - 5 - 0 - 0 - - &Engine: @@ -95,14 +87,6 @@ InstrumentFileTextLabel - - - 1 - 5 - 0 - 0 - - &Filename: @@ -113,7 +97,7 @@ InstrumentFileComboBox - + InstrumentFilePushButton @@ -147,7 +131,7 @@ Browse for instrument filename - + InstrumentFileComboBox @@ -172,56 +156,7 @@ Instrument filename - - - layout1 - - - - unnamed - - - - spacer3 - - - Horizontal - - - Expanding - - - - 8 - 8 - - - - - - OkPushButton - - - OK - - - formAccept.png - - - - - CancelPushButton - - - Cancel - - - formReject.png - - - - - + InstrumentNrComboBox @@ -257,13 +192,13 @@ InstrumentNrComboBox - + MidiGroupBox - 1 + 7 5 0 0 @@ -282,14 +217,6 @@ 8 - - - MidiDriverComboBox - - - MIDI input driver type - - MidiDriverTextLabel @@ -304,14 +231,6 @@ MidiDriverComboBox - - - MidiDeviceComboBox - - - MIDI input device - - MidiDeviceTextLabel @@ -326,124 +245,251 @@ MidiDeviceComboBox - - - MidiPortSpinBox - - - MIDI input port number - - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - - - All - - - - MidiChannelComboBox - - - MIDI input channel - - - + - MidiChannelTextLabel - - - &Channel: - - - AlignVCenter|AlignRight - - - MidiChannelComboBox + layout11 + + + unnamed + + + + MidiDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + MIDI input driver type + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 25 + 16 + + + + + + MidiPortTextLabel + + + &Port: + + + AlignVCenter|AlignRight + + + MidiPortSpinBox + + + + + MidiPortSpinBox + + + MIDI input port number + + + + + MidiChannelTextLabel + + + &Channel: + + + AlignVCenter|AlignRight + + + MidiChannelComboBox + + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 14 + + + + + 15 + + + + + 16 + + + + + All + + + + MidiChannelComboBox + + + MIDI input channel + + + + + + + layout12 + + + + unnamed + + + + MidiDeviceComboBox + + + + 7 + 0 + 0 + 0 + + + + MIDI input device + + + + + MidiDevicePushButton + + + + 0 + 0 + 0 + 0 + + + + + 24 + 24 + + + + + 26 + 26 + + + + + + + midi1.png + + + MIDI input device setup + + + - + + + + + layout01 + + + + unnamed + + - spacer1 + spacer3 Horizontal @@ -453,34 +499,42 @@ - 16 + 8 8 - + - MidiPortTextLabel + OkPushButton - &Port: + OK - - AlignVCenter|AlignRight + + formAccept.png - - MidiPortSpinBox + + + + CancelPushButton + + + Cancel + + + formReject.png - + - + AudioGroupBox - 1 + 7 5 0 0 @@ -502,22 +556,6 @@ 8 - - - AudioDeviceComboBox - - - Audio output device - - - - - AudioDriverComboBox - - - Audio output driver type - - AudioDriverTextLabel @@ -532,6 +570,109 @@ AudioDriverComboBox + + + layout21 + + + + unnamed + + + + AudioDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + Audio output driver type + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 210 + 16 + + + + + + + + layout22 + + + + unnamed + + + + AudioDeviceComboBox + + + + 7 + 0 + 0 + 0 + + + + Audio output device + + + + + AudioDevicePushButton + + + + 0 + 0 + 0 + 0 + + + + + 24 + 24 + + + + + 26 + 26 + + + + + + + audio1.png + + + Audio output device setup + + + + AudioDeviceTextLabel @@ -546,27 +687,44 @@ AudioDeviceComboBox - + - spacer2 - - - Horizontal + AudioRoutingTable - - Expanding - - + - 210 - 8 + 0 + 100 - + + StrongFocus + + + Audio output channel routing + + + + + qsamplerChannelRoutingTable +
qsamplerChannel.h
+ + -1 + -1 + + 0 + + 7 + 7 + 0 + 0 + + + EngineNameComboBox @@ -576,7 +734,7 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() @@ -594,7 +752,7 @@ MidiDriverComboBox - activated(const QString &) + activated(const QString&) qsamplerChannelForm selectMidiDriver(const QString&) @@ -618,7 +776,7 @@ AudioDriverComboBox - activated(const QString &) + activated(const QString&) qsamplerChannelForm selectAudioDriver(const QString&) @@ -640,6 +798,18 @@ qsamplerChannelForm reject() + + MidiDevicePushButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDevicePushButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox @@ -650,8 +820,11 @@ MidiPortSpinBox MidiChannelComboBox MidiDeviceComboBox + MidiDevicePushButton AudioDriverComboBox AudioDeviceComboBox + AudioDevicePushButton + AudioRoutingTable OkPushButton CancelPushButton @@ -660,12 +833,17 @@ qsamplerChannel.h qsamplerChannelForm.ui.h + + class qsamplerDeviceForm; + qsamplerChannel *m_pChannel; int m_iDirtySetup; int m_iDirtyCount; QPtrList < qsamplerDevice > m_audioDevices; QPtrList < qsamplerDevice > m_midiDevices; + qsamplerDeviceForm *m_pDeviceForm; + qsamplerChannelRoutingMap m_audioRouting; accept() @@ -674,8 +852,12 @@ updateInstrumentName() selectMidiDriver( const QString & sMidiDriver ) selectMidiDevice( int iMidiItem ) + setupMidiDevice() selectAudioDriver( const QString & sAudioDriver ) selectAudioDevice( int iAudioItem ) + setupAudioDevice() + changeAudioRouting( int iRow, int iCol ) + updateDevices() optionsChanged() stabilizeForm() @@ -683,7 +865,12 @@ init() destroy() setup( qsamplerChannel *pChannel ) + setupDevice( qsamplerDevice *pDevice, qsamplerDevice::qsamplerDeviceType deviceTypeMode, const QString & sDriverName ) + selectMidiDriverItem( const QString & sMidiDriver ) + selectMidiDeviceItem( int iMidiItem ) + selectAudioDriverItem( const QString & sAudioDriver ) + selectAudioDeviceItem( int iAudioItem ) - +