Commit 65cdb61a authored by jua20133's avatar jua20133
Browse files

Fixed for qt 5.4

parent 4463d2a0
......@@ -179,7 +179,7 @@ void JMess::disconnectAll()
it != mConnectedPorts.end(); ++it) {
OutputInput = *it;
if (jack_disconnect(mClient, OutputInput[0].toAscii(), OutputInput[1].toAscii())) {
if (jack_disconnect(mClient, OutputInput[0].toLatin1(), OutputInput[1].toLatin1())) {
cerr << "WARNING: port: " << qPrintable(OutputInput[0])
<< "and port: " << qPrintable(OutputInput[1])
<< " could not be disconnected.\n";
......@@ -272,11 +272,11 @@ void JMess::connectPorts(QString xmlInFile)
it != mPortsToConnect.end(); ++it) {
OutputInput = *it;
if (jack_connect(mClient, OutputInput[0].toAscii(), OutputInput[1].toAscii())) {
if (jack_connect(mClient, OutputInput[0].toLatin1(), OutputInput[1].toLatin1())) {
//Display a warining only if the error is not because the ports are already
//connected, in case the program doesn't display anyting.
if (EEXIST !=
jack_connect(mClient, OutputInput[0].toAscii(), OutputInput[1].toAscii())) {
jack_connect(mClient, OutputInput[0].toLatin1(), OutputInput[1].toLatin1())) {
cerr << "WARNING: port: " << qPrintable(OutputInput[0])
<< "and port: " << qPrintable(OutputInput[1])
<< " could not be connected.\n";
......
......@@ -14,7 +14,16 @@ fi
# Set qmake command name
if [[ $platform == 'linux' ]]; then
QCMD=qmake-qt4
if hash qmake-qt5 2>/dev/null; then
echo "Using qmake-qt5"
QCMD=qmake-qt5
elif hash qmake-qt4 2>/dev/null; then
echo "Using qmake-qt4"
QCMD=qmake-qt4
elif hash qmake 2>/dev/null; then #in case qt was compiled by user
echo "Using qmake"
QCMD=qmake
fi
QSPEC=linux-g++
elif [[ $platform == 'macosx' ]]; then
QCMD=qmake
......@@ -22,15 +31,8 @@ elif [[ $platform == 'macosx' ]]; then
fi
# Build
if [[ $1 == 'nojack' ]]; then
echo "Building without Jack"
$QCMD -spec $QSPEC -config nojack jmess.pro
make clean
$QCMD -spec $QSPEC -config nojack jmess.pro
make release
else
$QCMD -spec $QSPEC jmess.pro
make clean
$QCMD -spec $QSPEC jmess.pro
make release
fi
$QCMD -spec $QSPEC jmess.pro
make clean
$QCMD -spec $QSPEC jmess.pro
make release
......@@ -13,7 +13,7 @@ QT += xml
!win32 {
INCLUDEPATH+=/usr/local/include
LIBS += -ljack -lm
LIBS += -L/usr/local/lib -ljack -lm
}
macx {
......
......@@ -38,7 +38,7 @@ using namespace std;
void main_dialog( int argc, char* argv[] );
void printUsage();
string version = "1.0.1";
string version = "1.0.2";
//*******************************************************************************
......@@ -112,7 +112,7 @@ void main_dialog( int argc, char* argv[] )
case 'v':
//-------------------------------------------------------
cout << "JMess VERSION: " << version << endl;
cout << "Copyright (c) 2007-2010 Juan-Pablo Caceres." << endl;
cout << "Copyright (c) 2007-2015 Juan-Pablo Caceres." << endl;
cout << "SoundWIRE group at CCRMA, Stanford University" << endl;
cout << "" << endl;
std::exit(0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment