--- qsampler/trunk/src/qsamplerChannelForm.ui 2005/02/11 08:46:58 367 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2005/08/28 12:15:16 760 @@ -28,8 +28,8 @@ 0 0 - 430 - 255 + 491 + 417 @@ -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 @@ -272,7 +207,7 @@ MIDI / Input - + unnamed @@ -282,7 +217,7 @@ 8 - + MidiDriverTextLabel @@ -290,157 +225,271 @@ &Type: - AlignVCenter|AlignRight + AlignVCenter MidiDriverComboBox - - - - ALSA - - + - MidiDriverComboBox - - - MIDI input driver type - - - - - MidiPortTextLabel + MidiDeviceTextLabel - &Port: + &Device: - AlignVCenter|AlignRight + AlignVCenter - MidiPortSpinBox + MidiDeviceComboBox - + - MidiPortSpinBox - - - MIDI input port number - - - - - MidiChannelTextLabel - - - &Channel: - - - AlignVCenter|AlignRight - - - MidiChannelComboBox + layout11 + + + unnamed + + + + MidiDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + MIDI input driver type + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + + + + 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 + + + - - - - 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 + - spacer2 + spacer3 Horizontal @@ -455,15 +504,37 @@ + + + OkPushButton + + + OK + + + formAccept.png + + + + + CancelPushButton + + + Cancel + + + formReject.png + + - + AudioGroupBox - 1 + 7 5 0 0 @@ -475,7 +546,7 @@ AlignAuto - + unnamed @@ -485,7 +556,7 @@ 8 - + AudioDriverTextLabel @@ -493,51 +564,167 @@ &Type: - AlignVCenter|AlignRight + AlignVCenter AudioDriverComboBox - - - - ALSA - - - - - JACK - - + - AudioDriverComboBox + layout21 - - Audio output driver type + + + unnamed + + + + AudioDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + Audio output driver type + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + + + + + + 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 + + + - + - spacer3 + AudioDeviceTextLabel - - Horizontal + + &Device: - - Expanding + + AlignVCenter - + + AudioDeviceComboBox + + + + + AudioRoutingTable + + - 8 - 8 + 0 + 100 - - + + StrongFocus + + + Audio output channel routing + + + + + + qsamplerChannelRoutingTable +
qsamplerChannel.h
+ + -1 + -1 + + 0 + + 7 + 7 + 0 + 0 + + + EngineNameComboBox @@ -547,7 +734,7 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() @@ -565,9 +752,15 @@ MidiDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectMidiDriver(const QString&) + + + MidiDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectMidiDevice(int) MidiPortSpinBox @@ -583,9 +776,15 @@ AudioDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectAudioDriver(const QString&) + + + AudioDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectAudioDevice(int) OkPushButton @@ -599,6 +798,18 @@ qsamplerChannelForm reject() + + MidiDevicePushButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDevicePushButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox @@ -608,24 +819,45 @@ MidiDriverComboBox MidiPortSpinBox MidiChannelComboBox + MidiDeviceComboBox + MidiDevicePushButton AudioDriverComboBox + AudioDeviceComboBox + AudioDevicePushButton + AudioRoutingTable OkPushButton CancelPushButton + qsamplerDevice.h 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() reject() openInstrumentFile() 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() @@ -633,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 ) - +