--- qsampler/trunk/src/qsamplerChannelForm.ui 2004/11/17 15:55:02 300 +++ 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 - 430 - 255 + 435 + 330 @@ -41,7 +41,7 @@ - Channel + Qsampler: Channel qsamplerChannel.png @@ -73,14 +73,6 @@ EngineNameTextLabel - - - 1 - 5 - 0 - 0 - - &Engine: @@ -95,14 +87,6 @@ InstrumentFileTextLabel - - - 1 - 5 - 0 - 0 - - &Filename: @@ -174,7 +158,7 @@ - layout1 + layout01 @@ -263,7 +247,7 @@ - 1 + 7 5 0 0 @@ -272,7 +256,7 @@ MIDI / Input - + unnamed @@ -282,7 +266,7 @@ 8 - + MidiDriverTextLabel @@ -290,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 - - - - - MidiChannelTextLabel - - - &Channel: - - - AlignVCenter|AlignRight - - - MidiChannelComboBox + 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 + + + - - - - 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 + + + - - - spacer2 - - - Horizontal - - - Expanding - - - - 8 - 8 - - - - + @@ -463,7 +534,7 @@ - 1 + 7 5 0 0 @@ -475,7 +546,7 @@ AlignAuto - + unnamed @@ -485,7 +556,7 @@ 8 - + AudioDriverTextLabel @@ -493,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 + + + + + @@ -547,7 +700,7 @@ InstrumentFileComboBox - textChanged(const QString &) + activated(const QString&) qsamplerChannelForm updateInstrumentName() @@ -558,12 +711,24 @@ openInstrumentFile() - MidiDriverComboBox + InstrumentNrComboBox activated(int) qsamplerChannelForm optionsChanged() + MidiDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectMidiDriver(const QString&) + + + MidiDeviceComboBox + activated(int) + qsamplerChannelForm + selectMidiDevice(int) + + MidiPortSpinBox valueChanged(int) qsamplerChannelForm @@ -577,9 +742,15 @@ AudioDriverComboBox + activated(const QString&) + qsamplerChannelForm + selectAudioDriver(const QString&) + + + AudioDeviceComboBox activated(int) qsamplerChannelForm - optionsChanged() + selectAudioDevice(int) OkPushButton @@ -593,6 +764,18 @@ qsamplerChannelForm reject() + + MidiDevicePushButton + clicked() + qsamplerChannelForm + setupMidiDevice() + + + AudioDevicePushButton + clicked() + qsamplerChannelForm + setupAudioDevice() + EngineNameComboBox @@ -602,24 +785,42 @@ 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() + updateDevices() optionsChanged() stabilizeForm() @@ -627,6 +828,11 @@ 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 )