--- qsampler/trunk/src/qsamplerChannelForm.ui 2004/09/29 13:12:45 264 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2005/03/31 14:17:19 487 @@ -2,7 +2,7 @@ qsamplerChannelForm qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -28,8 +28,8 @@ 0 0 - 430 - 255 + 435 + 330 @@ -73,14 +73,6 @@ EngineNameTextLabel - - - 1 - 5 - 0 - 0 - - &Engine: @@ -93,18 +85,10 @@ - InstrumentTextLabel - - - - 1 - 5 - 0 - 0 - + InstrumentFileTextLabel - &Instrument: + &Filename: AlignVCenter|AlignRight @@ -174,7 +158,7 @@ - layout1 + layout01 @@ -221,18 +205,26 @@ - + - InstrumentNrSpinBox + InstrumentNrComboBox - + + + 7 + 0 + 0 + 0 + + + - 40 - 32767 + 320 + 0 - Instrument index + Instrument name @@ -240,29 +232,13 @@ InstrumentNrTextLabel - Inde&x: + &Instrument: AlignVCenter|AlignRight - InstrumentNrSpinBox - - - - - InstrumentNameTextLabel - - - - 1 - 5 - 0 - 0 - - - - Instrument name + InstrumentNrComboBox @@ -271,7 +247,7 @@ - 1 + 7 5 0 0 @@ -280,7 +256,7 @@ MIDI / Input - + unnamed @@ -290,7 +266,7 @@ 8 - + MidiDriverTextLabel @@ -298,172 +274,259 @@ &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 + 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 + + + - + - MidiChannelTextLabel - - - &Channel: - - - AlignVCenter|AlignRight - - - MidiChannelComboBox + 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 + + + - - - - All - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - - MidiChannelComboBox - - - MIDI input channel - - - - - spacer2 - - - Horizontal - - - Expanding - - - - 8 - 8 - - - - + @@ -471,7 +534,7 @@ - 1 + 7 5 0 0 @@ -483,7 +546,7 @@ AlignAuto - + unnamed @@ -493,7 +556,7 @@ 8 - + AudioDriverTextLabel @@ -501,48 +564,130 @@ &Type: - AlignVCenter|AlignRight + AlignVCenter AudioDriverComboBox - - - - ALSA - - - - - JACK - - + - AudioDriverComboBox + AudioDeviceTextLabel - - Audio output driver type + + &Device: - - - - spacer3 + + AlignVCenter - - Horizontal + + AudioDeviceComboBox - - Expanding + + + + layout21 - - - 8 - 8 - + + + 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 + + + + + @@ -555,7 +700,7 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() @@ -566,16 +711,22 @@ openInstrumentFile() - InstrumentNrSpinBox - valueChanged(int) + InstrumentNrComboBox + activated(int) qsamplerChannelForm - updateInstrumentName() + optionsChanged() MidiDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectMidiDriver(const QString&) + + + MidiDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectMidiDevice(int) MidiPortSpinBox @@ -591,9 +742,15 @@ AudioDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectAudioDriver(const QString&) + + + AudioDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectAudioDevice(int) OkPushButton @@ -607,40 +764,70 @@ qsamplerChannelForm reject() + + MidiDevicePushButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDevicePushButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox InstrumentFileComboBox InstrumentFilePushButton - InstrumentNrSpinBox + InstrumentNrComboBox MidiDriverComboBox MidiPortSpinBox MidiChannelComboBox + MidiDeviceComboBox + MidiDevicePushButton AudioDriverComboBox + AudioDeviceComboBox + AudioDevicePushButton 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; accept() reject() openInstrumentFile() updateInstrumentName() + selectMidiDriver( const QString & sMidiDriver ) + selectMidiDevice( int iMidiItem ) + setupMidiDevice() + selectAudioDriver( const QString & sAudioDriver ) + selectAudioDevice( int iAudioItem ) + setupAudioDevice() optionsChanged() stabilizeForm() init() destroy() - setup( qsamplerChannel *pChannel, bool bNew ) + setup( qsamplerChannel *pChannel ) + setupDevice( qsamplerDevice *pDevice )