summaryrefslogtreecommitdiff
path: root/muse2/muse/confmport.cpp
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2011-09-08 02:05:32 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2011-09-08 02:05:32 +0000
commitd3e8a1b4c98cb3ba8b73f367ea88ad23f8dbca66 (patch)
tree921e5193e46287f0c34f4eff1590efb1df18d20f /muse2/muse/confmport.cpp
parentff0c5e9154e7a3d71d2465639b5e0da1ea2c7242 (diff)
introducing namespaces
Diffstat (limited to 'muse2/muse/confmport.cpp')
-rw-r--r--muse2/muse/confmport.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp
index b5423699..b451a749 100644
--- a/muse2/muse/confmport.cpp
+++ b/muse2/muse/confmport.cpp
@@ -457,7 +457,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
case DEVCOL_INROUTES:
case DEVCOL_OUTROUTES:
{
- if(!checkAudioDevice())
+ if(!MusEGlobal::checkAudioDevice())
return;
if(audioDevice->deviceType() != AudioDevice::JACK_AUDIO) // Only if Jack is running.
@@ -647,7 +647,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device());
connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefInputRoutes(QAction*)));
- //connect(defpup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
+ //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide()));
//defpup->popup(QCursor::pos());
defpup->exec(QCursor::pos());
delete defpup;
@@ -690,7 +690,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device());
connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefOutputRoutes(QAction*)));
- //connect(defpup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
+ //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide()));
//defpup->popup(QCursor::pos());
defpup->exec(QCursor::pos());
delete defpup;
@@ -899,7 +899,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
}
midiSeq->msgSetMidiDevice(port, sdev);
- muse->changeConfig(true); // save configuration file
+ MusEGlobal::muse->changeConfig(true); // save configuration file
song->update();
}
}
@@ -1352,7 +1352,7 @@ void MPConfig::addInstanceClicked()
MidiDevice* dev = port->device();
if (dev==0) {
midiSeq->msgSetMidiDevice(port, si);
- muse->changeConfig(true); // save configuration file
+ MusEGlobal::muse->changeConfig(true); // save configuration file
song->update();
break;
}
@@ -1381,6 +1381,8 @@ void MPConfig::removeInstanceClicked()
audio->msgRemoveTrack(*ii);
}
+namespace MusEApp {
+
//---------------------------------------------------------
// configMidiPorts
//---------------------------------------------------------
@@ -1395,3 +1397,4 @@ void MusE::configMidiPorts()
midiPortConfig->activateWindow();
}
+} // namespace MusEApp