hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Consolidate midi config widgets & move them out of the core

Browse Source
This commit is contained in:
Colin Wallace
2015-08-23 16:54:40 -07:00
parent e606e30486
commit 697aebc056
17 changed files with 175 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/MidiAlsaRaw.h
View File

@@ -51,23 +51,14 @@ public:
inline static QString name()
{
return QT_TRANSLATE_NOOP( "setupWidget",
return QT_TRANSLATE_NOOP( "MidiSetupWidget",
"ALSA Raw-MIDI (Advanced Linux Sound Architecture)" );
}
class setupWidget : public MidiClientRaw::setupWidget
inline static QString configSection()
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings();
private:
QLineEdit * m_device;
} ;
return "MidiAlsaRaw";
}
protected:

21
include/MidiAlsaSeq.h
View File

@@ -54,11 +54,16 @@ public:
inline static QString name()
{
return QT_TRANSLATE_NOOP( "setupWidget",
return QT_TRANSLATE_NOOP( "MidiSetupWidget",
"ALSA-Sequencer (Advanced Linux Sound "
"Architecture)" );
}
inline static QString configSection()
{
return "Midialsaseq";
}
virtual void processOutEvent( const MidiEvent & _me,
@@ -107,20 +112,6 @@ public:
}
class setupWidget : public MidiClient::setupWidget
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings();
private:
QLineEdit * m_device;
} ;
private slots:
void changeQueueTempo( bpm_t _bpm );
void updatePortList();

24
include/MidiApple.h
View File

@@ -45,12 +45,18 @@ public:
MidiApple();
virtual ~MidiApple();
static QString probeDevice();
inline static QString probeDevice()
{
return QString::Null(); // no midi device name
}
inline static QString name()
{
return QT_TRANSLATE_NOOP( "setupWidget", "Apple MIDI" );
return QT_TRANSLATE_NOOP( "MidiSetupWidget", "Apple MIDI" );
}
inline static QString configSection()
{
return QString::Null(); // no configuration settings
}
virtual void processOutEvent( const MidiEvent & _me,
@@ -106,18 +112,6 @@ public:
}
class setupWidget : public MidiClient::setupWidget
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
void saveSettings()
{
}
} ;
private:// slots:
void updateDeviceList();

26
include/MidiClient.h
View File

@@ -106,32 +106,6 @@ public:
// any other working
static MidiClient * openMidiClient();
class setupWidget : public TabWidget
{
public:
setupWidget( const QString & _caption, QWidget * _parent ) :
TabWidget( TabWidget::tr( "Settings for %1" ).arg(
tr( _caption.toLatin1() ) ).toUpper(),
_parent )
{
}
virtual ~setupWidget()
{
}
virtual void saveSettings() = 0;
virtual void show()
{
parentWidget()->show();
QWidget::show();
}
} ;
protected:
QVector<MidiPort *> m_midiPorts;

31
include/MidiDummy.h
View File

@@ -40,34 +40,19 @@ public:
inline static QString name()
{
return( QT_TRANSLATE_NOOP( "setupWidget",
return( QT_TRANSLATE_NOOP( "MidiSetupWidget",
"Dummy (no MIDI support)" ) );
}
class setupWidget : public MidiClient::setupWidget
inline static QString probeDevice()
{
public:
setupWidget( QWidget * _parent ) :
MidiClientRaw::setupWidget( MidiDummy::name(), _parent )
{
}
return QString::Null(); // no midi device name
}
virtual ~setupWidget()
{
}
virtual void saveSettings()
{
}
virtual void show()
{
parentWidget()->hide();
QWidget::show();
}
} ;
inline static QString configSection()
{
return QString::Null(); // no configuration settings
}
protected:

18
include/MidiOss.h
View File

@@ -49,24 +49,14 @@ public:
inline static QString name()
{
return( QT_TRANSLATE_NOOP( "setupWidget",
return( QT_TRANSLATE_NOOP( "MidiSetupWidget",
"OSS Raw-MIDI (Open Sound System)" ) );
}
class setupWidget : public MidiClientRaw::setupWidget
inline static QString configSection()
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings();
private:
QLineEdit * m_device;
} ;
return "midioss";
}
protected:
virtual void sendByte( const unsigned char c );

56
include/MidiSetupWidget.h Normal file
View File

@@ -0,0 +1,56 @@
/*
* MidiSetupWidget - class for configuring midi sources in the settings window
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of LMMS - http://lmms.io
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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 (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#ifndef MIDISETUPWIDGET_H
#define MIDISETUPWIDGET_H
#include <QLabel>
#include "TabWidget.h"
class QLineEdit;
class MidiSetupWidget : public TabWidget
{
MidiSetupWidget( const QString & caption, const QString & configSection,
const QString & devName, QWidget * parent );
public:
// create a widget with editors for all of @MidiClientType's fields
template <typename MidiClientType> static MidiSetupWidget* create( QWidget * parent )
{
QString configSection = MidiClientType::configSection();
QString dev = MidiClientType::probeDevice();
return new MidiSetupWidget(MidiClientType::name(), configSection, dev, parent);
}
void saveSettings();
void show();
private:
QString m_configSection;
QLineEdit *m_device;
};
#endif

25
include/MidiWinMM.h
View File

@@ -45,12 +45,20 @@ public:
MidiWinMM();
virtual ~MidiWinMM();
static QString probeDevice();
inline static QString probeDevice()
{
return QString::Null(); // no midi device name
}
inline static QString name()
{
return QT_TRANSLATE_NOOP( "setupWidget", "WinMM MIDI" );
return QT_TRANSLATE_NOOP( "MidiSetupWidget", "WinMM MIDI" );
}
inline static QString configSection()
{
return QString::Null(); // no configuration settings
}
@@ -104,19 +112,6 @@ public:
}
class setupWidget : public MidiClient::setupWidget
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings()
{
}
} ;
private:// slots:
void updateDeviceList();

3
include/SetupDialog.h
View File

@@ -32,6 +32,7 @@
#include "lmmsconfig.h"
#include "AudioDevice.h"
#include "MidiClient.h"
#include "MidiSetupWidget.h"
#include "AudioDeviceSetupWidget.h"
@@ -181,7 +182,7 @@ private:
bool m_disableAutoQuit;
typedef QMap<QString, AudioDeviceSetupWidget *> AswMap;
typedef QMap<QString, MidiClient::setupWidget *> MswMap;
typedef QMap<QString, MidiSetupWidget *> MswMap;
typedef QMap<QString, QString> trMap;
QComboBox * m_audioInterfaces;