--- qsampler/trunk/src/qsamplerChannelForm.ui 2005/03/13 22:06:59 452 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2006/12/17 22:29:29 980 @@ -2,7 +2,7 @@ qsamplerChannelForm qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2006, 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 - 455 - 303 + 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: @@ -95,14 +87,6 @@ InstrumentFileTextLabel - - - 1 - 5 - 0 - 0 - - &Filename: @@ -113,9 +97,9 @@ InstrumentFileComboBox - + - InstrumentFilePushButton + InstrumentFileToolButton @@ -137,17 +121,20 @@ 26 + + TabFocus + - - fileOpen.png + + fileOpen.png Browse for instrument filename - + InstrumentFileComboBox @@ -172,9 +159,9 @@ Instrument filename - + - layout1 + layout01 @@ -182,7 +169,7 @@ - spacer3 + spacer4 Horizontal @@ -221,56 +208,23 @@ - + - InstrumentNrComboBox + AudioGroupBox 7 - 0 - 0 - 0 - - - - - 320 - 0 - - - - Instrument name - - - - - InstrumentNrTextLabel - - - &Instrument: - - - AlignVCenter|AlignRight - - - InstrumentNrComboBox - - - - - MidiGroupBox - - - - 1 5 0 0 - MIDI / Input + Audio / Output + + + AlignAuto @@ -282,17 +236,9 @@ 8 - - - MidiDriverComboBox - - - MIDI input driver type - - - MidiDriverTextLabel + AudioDriverTextLabel &Type: @@ -301,20 +247,118 @@ AlignVCenter - MidiDriverComboBox + AudioDriverComboBox - + - MidiDeviceComboBox - - - MIDI input device + layout21 + + + unnamed + + + + AudioDriverComboBox + + + + 5 + 0 + 0 + 0 + + + + Audio output driver type + + + + + spacer3 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + + + + + + 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 + + + - MidiDeviceTextLabel + AudioDeviceTextLabel &Device: @@ -323,174 +367,78 @@ AlignVCenter - 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 + AudioDeviceComboBox - + - spacer1 - - - Horizontal + AudioRoutingTable - - Expanding - - + - 16 - 8 + 0 + 100 - - - - MidiPortTextLabel - - - &Port: + + StrongFocus - - AlignVCenter|AlignRight - - - MidiPortSpinBox + + Audio output channel routing - + - 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 @@ -502,25 +450,9 @@ 8 - - - AudioDeviceComboBox - - - Audio output device - - - - - AudioDriverComboBox - - - Audio output driver type - - - AudioDriverTextLabel + MidiDriverTextLabel &Type: @@ -529,12 +461,75 @@ AlignVCenter - AudioDriverComboBox + MidiDriverComboBox + + + + + 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 + + + - AudioDeviceTextLabel + MidiDeviceTextLabel &Device: @@ -543,30 +538,259 @@ AlignVCenter - AudioDeviceComboBox + MidiDeviceComboBox - + - spacer2 + MidiMapTextLabel - - Horizontal + + &Map: - - Expanding + + AlignVCenter|AlignRight - - - 210 - 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 name + + + + + spacer1_2 + + + Horizontal + + + Expanding + + + + 160 + 20 + + + + + + + + qsamplerChannelRoutingTable +
qsamplerChannel.h
+ + -1 + -1 + + 0 + + 7 + 7 + 0 + 0 + + + EngineNameComboBox @@ -576,12 +800,12 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() - InstrumentFilePushButton + InstrumentFileToolButton clicked() qsamplerChannelForm openInstrumentFile() @@ -594,11 +818,17 @@ MidiDriverComboBox - activated(const QString &) + activated(const QString&) qsamplerChannelForm selectMidiDriver(const QString&) + MidiDeviceComboBox + activated(int) + qsamplerChannelForm + selectMidiDevice(int) + + MidiPortSpinBox valueChanged(int) qsamplerChannelForm @@ -611,12 +841,24 @@ optionsChanged() + MidiMapComboBox + activated(int) + qsamplerChannelForm + optionsChanged() + + AudioDriverComboBox - activated(const QString &) + activated(const QString&) qsamplerChannelForm selectAudioDriver(const QString&) + AudioDeviceComboBox + activated(int) + qsamplerChannelForm + selectAudioDevice(int) + + OkPushButton clicked() qsamplerChannelForm @@ -628,18 +870,34 @@ qsamplerChannelForm reject() + + MidiDeviceToolButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDeviceToolButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox InstrumentFileComboBox - InstrumentFilePushButton + InstrumentFileToolButton InstrumentNrComboBox MidiDriverComboBox MidiPortSpinBox MidiChannelComboBox MidiDeviceComboBox + MidiDeviceToolButton + MidiMapComboBox AudioDriverComboBox AudioDeviceComboBox + AudioDeviceToolButton + AudioRoutingTable OkPushButton CancelPushButton @@ -648,12 +906,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() @@ -661,7 +924,13 @@ 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() @@ -669,7 +938,15 @@ 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 ) - + + + qsamplerChannel.h +