--- qsampler/trunk/src/qsamplerChannelForm.ui 2004/07/06 10:54:45 176 +++ qsampler/trunk/src/qsamplerChannelForm.ui 2005/08/26 23:04:32 757 @@ -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 - 424 - 268 + 435 + 330 @@ -41,7 +41,7 @@ - Channel + Qsampler: Channel qsamplerChannel.png @@ -73,14 +73,6 @@ EngineNameTextLabel - - - 1 - 5 - 0 - 0 - - &Engine: @@ -93,18 +85,10 @@ - InstrumentTextLabel - - - - 1 - 5 - 0 - 0 - + InstrumentFileTextLabel - &Instrument: + &Filename: AlignVCenter|AlignRight @@ -159,6 +143,12 @@ 0 + + + 320 + 0 + + true @@ -166,26 +156,9 @@ Instrument filename - - - spacer1 - - - Vertical - - - Expanding - - - - 8 - 8 - - - - layout1 + layout01 @@ -232,18 +205,26 @@ - + - InstrumentNrSpinBox + InstrumentNrComboBox - + + + 7 + 0 + 0 + 0 + + + - 40 - 32767 + 320 + 0 - Instrument index + Instrument name @@ -251,29 +232,13 @@ InstrumentNrTextLabel - Inde&x: + &Instrument: AlignVCenter|AlignRight - InstrumentNrSpinBox - - - - - InstrumentNameTextLabel - - - - 1 - 5 - 0 - 0 - - - - Instrument name + InstrumentNrComboBox @@ -282,16 +247,16 @@ - 1 + 7 5 0 0 - &MIDI/Input + MIDI / Input - + unnamed @@ -301,7 +266,7 @@ 8 - + MidiDriverTextLabel @@ -309,93 +274,259 @@ &Type: - AlignVCenter|AlignRight + AlignVCenter MidiDriverComboBox - - - - ALSA - - - - MidiDriverComboBox - - - MIDI input driver type - - - + - MidiPortTextLabel + MidiDeviceTextLabel - &Port: + &Device: - AlignVCenter|AlignRight + AlignVCenter - MidiPortSpinBox - - - - - MidiPortSpinBox - - - MIDI input port number + MidiDeviceComboBox - + - MidiChannelTextLabel - - - &Channel: - - - AlignVCenter|AlignRight - - - MidiChannelSpinBox + 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 + + + - + - MidiChannelSpinBox - - - 16 - - - 0 - - - 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 + + + - - - spacer2 - - - Horizontal - - - Expanding - - - - 8 - 8 - - - - + @@ -403,19 +534,19 @@ - 1 + 7 5 0 0 - &Audio/Output + Audio / Output AlignAuto - + unnamed @@ -425,7 +556,7 @@ 8 - + AudioDriverTextLabel @@ -433,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 + + + + + @@ -487,7 +700,7 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() @@ -498,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 @@ -516,16 +735,22 @@ optionsChanged() - MidiChannelSpinBox - valueChanged(int) + MidiChannelComboBox + activated(int) qsamplerChannelForm optionsChanged() AudioDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectAudioDriver(const QString&) + + + AudioDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectAudioDevice(int) OkPushButton @@ -539,42 +764,75 @@ qsamplerChannelForm reject() + + MidiDevicePushButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDevicePushButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox InstrumentFileComboBox InstrumentFilePushButton - InstrumentNrSpinBox + InstrumentNrComboBox MidiDriverComboBox MidiPortSpinBox - MidiChannelSpinBox + MidiChannelComboBox + MidiDeviceComboBox + MidiDevicePushButton AudioDriverComboBox + AudioDeviceComboBox + AudioDevicePushButton 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; accept() reject() openInstrumentFile() updateInstrumentName() + selectMidiDriver( const QString & sMidiDriver ) + selectMidiDevice( int iMidiItem ) + setupMidiDevice() + selectAudioDriver( const QString & sAudioDriver ) + selectAudioDevice( int iAudioItem ) + setupAudioDevice() + updateDevices() optionsChanged() stabilizeForm() init() destroy() - setup( qsamplerChannelStrip *pChannel, bool bNew ) + 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 )