support for cmake < 2.4.8
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1371 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -29,8 +29,8 @@
|
||||
#include "lmmsconfig.h"
|
||||
|
||||
#ifdef LMMS_HAVE_ALSA
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
#endif
|
||||
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QTimer>
|
||||
@@ -127,6 +127,7 @@ private slots:
|
||||
private:
|
||||
virtual void run( void );
|
||||
|
||||
#ifdef LMMS_HAVE_ALSA
|
||||
snd_seq_t * m_seqHandle;
|
||||
struct ports
|
||||
{
|
||||
@@ -135,6 +136,7 @@ private:
|
||||
private: int p[2];
|
||||
} ;
|
||||
QMap<midiPort *, ports> m_portIDs;
|
||||
#endif
|
||||
|
||||
int m_queueID;
|
||||
|
||||
@@ -155,5 +157,3 @@ signals:
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
#include "lmmsconfig.h"
|
||||
|
||||
#ifdef LMMS_BUILD_WIN32
|
||||
|
||||
#include <windows.h>
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
@@ -67,6 +67,7 @@ public:
|
||||
virtual void removePort( midiPort * _port );
|
||||
|
||||
|
||||
#ifdef LMMS_BUILD_WIN32
|
||||
// list devices as ports
|
||||
virtual QStringList readablePorts( void ) const
|
||||
{
|
||||
@@ -77,6 +78,7 @@ public:
|
||||
{
|
||||
return( m_outputDevices.values() );
|
||||
}
|
||||
#endif
|
||||
|
||||
// (un)subscribe given midiPort to/from destination-port
|
||||
virtual void subscribeReadablePort( midiPort * _port,
|
||||
@@ -126,6 +128,8 @@ private slots:
|
||||
private:
|
||||
void openDevices( void );
|
||||
void closeDevices( void );
|
||||
|
||||
#ifdef LMMS_BUILD_WIN32
|
||||
static void CALLBACK inputCallback( HMIDIIN _hm, UINT _msg,
|
||||
DWORD_PTR _inst,
|
||||
DWORD_PTR _param1,
|
||||
@@ -135,6 +139,7 @@ private:
|
||||
QTimer m_deviceListUpdateTimer;
|
||||
QMap<HMIDIIN, QString> m_inputDevices;
|
||||
QMap<HMIDIOUT, QString> m_outputDevices;
|
||||
#endif
|
||||
|
||||
// subscriptions
|
||||
typedef QMap<QString, midiPortList> subMap;
|
||||
@@ -150,5 +155,3 @@ signals:
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user