Added support for building for Win32/Win64 with Qt5

This commit is contained in:
Tobias Doerffel
2014-08-16 17:20:00 +02:00
parent 8ac71f7000
commit 311d290b32
7 changed files with 28 additions and 13 deletions

View File

@@ -29,7 +29,6 @@
#ifdef LMMS_HAVE_JACK
#include <jack/jack.h>
#endif
#include <QtCore/QVector>
#include <QtCore/QList>
@@ -75,7 +74,6 @@ private slots:
void restartAfterZombified();
#ifdef LMMS_HAVE_JACK
private:
bool initJackClient();
@@ -118,7 +116,6 @@ private:
typedef QMap<AudioPort *, StereoPort> JackPortMap;
JackPortMap m_portMap;
#endif
#endif
signals:
void zombified();
@@ -126,3 +123,5 @@ signals:
} ;
#endif
#endif

View File

@@ -29,7 +29,6 @@
#ifdef LMMS_HAVE_ALSA
#include <alsa/asoundlib.h>
#endif
#include <QtCore/QMutex>
#include <QtCore/QThread>
@@ -161,3 +160,5 @@ signals:
#endif
#endif

View File

@@ -63,7 +63,6 @@ public:
virtual void removePort( MidiPort * _port );
#ifdef LMMS_BUILD_WIN32
// list devices as ports
virtual QStringList readablePorts() const
{
@@ -74,7 +73,6 @@ public:
{
return m_outputDevices.values();
}
#endif
// return name of port which specified MIDI event came from
virtual QString sourcePortName( const MidiEvent & ) const;
@@ -127,7 +125,6 @@ private:
void openDevices();
void closeDevices();
#ifdef LMMS_BUILD_WIN32
static void WINAPI CALLBACK inputCallback( HMIDIIN _hm, UINT _msg,
DWORD_PTR _inst,
DWORD_PTR _param1,
@@ -136,7 +133,6 @@ private:
QMap<HMIDIIN, QString> m_inputDevices;
QMap<HMIDIOUT, QString> m_outputDevices;
#endif
// subscriptions
typedef QMap<QString, MidiPortList> SubMap;