--- qsampler/trunk/src/qsamplerChannelForm.ui 2004/05/30 15:38:06 95 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2007/01/08 22:04:33 1016 @@ -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-2007, 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 @@ -14,9 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. rncbc aka Rui Nuno Capela @@ -28,8 +28,8 @@ 0 0 - 424 - 268 + 446 + 436 @@ -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: @@ -93,18 +85,10 @@ - InstrumentTextLabel - - - - 1 - 5 - 0 - 0 - + InstrumentFileTextLabel - &Instrument: + &Filename: AlignVCenter|AlignRight @@ -113,9 +97,9 @@ InstrumentFileComboBox - + - InstrumentFilePushButton + InstrumentFileToolButton @@ -137,17 +121,20 @@ 26 + + TabFocus + - - fileOpen.png + + fileOpen.png Browse for instrument filename - + InstrumentFileComboBox @@ -159,6 +146,12 @@ 0 + + + 320 + 0 + + true @@ -166,26 +159,9 @@ Instrument filename - - - spacer1 - - - Vertical - - - Expanding - - - - 8 - 8 - - - - + - layout1 + layout01 @@ -193,7 +169,7 @@ - spacer3 + spacer4 Horizontal @@ -232,66 +208,25 @@ - - - InstrumentNrSpinBox - - - - 40 - 32767 - - - - Instrument index - - - - - InstrumentNrTextLabel - - - Inde&x: - - - AlignVCenter|AlignRight - - - InstrumentNrSpinBox - - - + - InstrumentNameTextLabel - - - - 1 - 5 - 0 - 0 - - - - Instrument name - - - - - MidiGroupBox + AudioGroupBox - 1 + 7 5 0 0 - &MIDI/Input + Audio / Output - + + AlignAuto + + unnamed @@ -301,121 +236,211 @@ 8 - + - MidiDriverTextLabel + AudioDriverTextLabel &Type: - AlignVCenter|AlignRight + AlignVCenter - MidiDriverComboBox - - - - - - ALSA - - - - MidiDriverComboBox - - - MIDI input driver type + AudioDriverComboBox - + - MidiPortTextLabel - - - &Port: - - - AlignVCenter|AlignRight - - - MidiPortSpinBox + layout21 + + + unnamed + + + + AudioDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + Audio output driver type + + + + + spacer3 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + + - + - MidiPortSpinBox - - - MIDI input port number + layout22 + + + unnamed + + + + AudioDeviceComboBox + + + + 7 + 0 + 0 + 0 + + + + Audio output device + + + + + AudioDeviceToolButton + + + + 0 + 0 + 0 + 0 + + + + + 24 + 24 + + + + + 26 + 26 + + + + TabFocus + + + + + + audio1.png + + + Audio output device setup + + + - + - MidiChannelTextLabel + AudioDeviceTextLabel - &Channel: + &Device: - AlignVCenter|AlignRight + AlignVCenter - MidiChannelSpinBox + AudioDeviceComboBox - + - MidiChannelSpinBox + AudioRoutingTable - - 16 + + + 0 + 100 + - - 0 + + StrongFocus - MIDI input channel + Audio output channel routing - - - spacer2 - - - Horizontal - - - Expanding - - - - 8 - 8 - - - - + - + - AudioGroupBox + InstrumentNrTextLabel + + + &Instrument: + + + AlignVCenter|AlignRight + + + InstrumentNrComboBox + + + + + InstrumentNrComboBox - 1 + 7 + 0 + 0 + 0 + + + + + 320 + 0 + + + + Instrument name + + + + + MidiGroupBox + + + + 7 5 0 0 - &Audio/Output - - - AlignAuto + MIDI / Input - + unnamed @@ -425,59 +450,347 @@ 8 - + - AudioDriverTextLabel + MidiDriverTextLabel &Type: - AlignVCenter|AlignRight + AlignVCenter - AudioDriverComboBox + MidiDriverComboBox - - - - ALSA - - - - - JACK + + + layout12 + + + + unnamed - + + + MidiDeviceComboBox + + + + 7 + 0 + 0 + 0 + + + + MIDI input device + + + + + MidiDeviceToolButton + + + + 0 + 0 + 0 + 0 + + + + + 24 + 24 + + + + + 26 + 26 + + + + TabFocus + + + + + + midi1.png + + + MIDI input device setup + + + + + - AudioDriverComboBox + MidiDeviceTextLabel - - Audio output driver type + + &Device: + + + AlignVCenter + + + MidiDeviceComboBox - + - spacer3 + MidiMapTextLabel - - Horizontal + + &Map: - - Expanding + + AlignVCenter|AlignRight - - - 8 - 8 - + + MidiMapComboBox - - + + + + 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 + + + + + + + layout6 + + + + unnamed + + + + MidiMapComboBox + + + + 7 + 0 + 0 + 0 + + + + Instrument map + + + + + spacer1_2 + + + Horizontal + + + Expanding + + + + 160 + 20 + + + + + + + + + qsamplerChannelRoutingTable +
qsamplerChannel.h
+ + -1 + -1 + + 0 + + 7 + 7 + 0 + 0 + + + EngineNameComboBox @@ -487,27 +800,33 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() - InstrumentFilePushButton + InstrumentFileToolButton clicked() qsamplerChannelForm 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 @@ -516,18 +835,30 @@ optionsChanged() - MidiChannelSpinBox - valueChanged(int) + MidiChannelComboBox + activated(int) qsamplerChannelForm optionsChanged() - AudioDriverComboBox + MidiMapComboBox activated(int) qsamplerChannelForm optionsChanged() + AudioDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectAudioDriver(const QString&) + + + AudioDeviceComboBox + activated(int) + qsamplerChannelForm + selectAudioDevice(int) + + OkPushButton clicked() qsamplerChannelForm @@ -539,43 +870,83 @@ qsamplerChannelForm reject() + + MidiDeviceToolButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDeviceToolButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox InstrumentFileComboBox - InstrumentFilePushButton - InstrumentNrSpinBox + InstrumentFileToolButton + InstrumentNrComboBox MidiDriverComboBox MidiPortSpinBox - MidiChannelSpinBox + MidiChannelComboBox + MidiDeviceComboBox + MidiDeviceToolButton + MidiMapComboBox AudioDriverComboBox + AudioDeviceComboBox + AudioDeviceToolButton + AudioRoutingTable OkPushButton CancelPushButton + qsamplerDevice.h + qsamplerChannel.h qsamplerChannelForm.ui.h - class qsamplerChannelStrip; + class qsamplerDeviceForm; - qsamplerChannelStrip *m_pChannel; + 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() init() destroy() - setup( qsamplerChannelStrip *pChannel ) + 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 ) - + + + qsamplerChannel.h +