update

9 files changed, 3 insertions, 34 deletions

diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index c2b81934..b9a5ea93 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -58,7 +58,7 @@ set(muse_mocs
 	projectdialog templatedialog 
       preferences plugingui midiplugin muse 
       song transport conf editor
-	cobject transpose track midisynti midiport
+	cobject transpose track midisynti
       miditrack wavetrack audiotrack audioaux audiooutput
       audioinput audiogroup exportmidi
       midiedit/pianoroll 
@@ -112,6 +112,7 @@ add_executable ( muse
 	midictrl.cpp fifo.cpp
 	midiseq.cpp helper.cpp route.cpp shortcuts.cpp ctrl.cpp
       gconfig.cpp midirc.cpp midififo.cpp
+      midiport.cpp
 
       midiedit/drummap.cpp 
       midiedit/citem.cpp 
diff --git a/muse/muse/arranger/tlswidget.cpp b/muse/muse/arranger/tlswidget.cpp
index df498647..dd300292 100644
--- a/muse/muse/arranger/tlswidget.cpp
+++ b/muse/muse/arranger/tlswidget.cpp
@@ -26,7 +26,6 @@
 #include "arranger.h"
 #include "widgets/simplebutton.h"
 #include "muse.h"
-#include "midiport.h"
 #include "ctrl/configmidictrl.h"
 #include "ctrl/ctrldialog.h"
 #include "midictrl.h"
diff --git a/muse/muse/arranger/tlwidget.cpp b/muse/muse/arranger/tlwidget.cpp
index 1dc8e0d8..f825790d 100644
--- a/muse/muse/arranger/tlwidget.cpp
+++ b/muse/muse/arranger/tlwidget.cpp
@@ -31,7 +31,6 @@
 #include "gconfig.h"
 #include "widgets/utils.h"
 #include "trackdrag.h"
-#include "midiport.h"
 #include "synth.h"
 #include "widgets/outportcombo.h"
 #include "audio.h"
diff --git a/muse/muse/arranger/trackinfo.cpp b/muse/muse/arranger/trackinfo.cpp
index 8107c5f5..3346e05d 100644
--- a/muse/muse/arranger/trackinfo.cpp
+++ b/muse/muse/arranger/trackinfo.cpp
@@ -537,7 +537,7 @@ MidiOutPortInfo::MidiOutPortInfo()
       {
       instrument = new QComboBox(this);
       instrument->setFixedWidth(infoWidth);
-      instrument->setToolTip(tr("Midi Device"));
+      instrument->setToolTip(tr("Midi Instrument"));
       grid->addWidget(instrument,  2, 0, 1, 2);
 
       grid->setRowStretch(grid->rowCount(), 100);
diff --git a/muse/muse/instruments/midictrledit.cpp b/muse/muse/instruments/midictrledit.cpp
index 61b543b3..9c340cb2 100644
--- a/muse/muse/instruments/midictrledit.cpp
+++ b/muse/muse/instruments/midictrledit.cpp
@@ -7,7 +7,6 @@
 //=========================================================
 
 #include "app.h"
-#include "midiport.h"
 #include "driver/mididev.h"
 #include "midictrl.h"
 #include "midictrledit.h"
diff --git a/muse/muse/liste/editevent.cpp b/muse/muse/liste/editevent.cpp
index c6f5d13e..d203bc1c 100644
--- a/muse/muse/liste/editevent.cpp
+++ b/muse/muse/liste/editevent.cpp
@@ -11,11 +11,9 @@
 #include "editevent.h"
 #include "awl/pitchlabel.h"
 #include "awl/pitchedit.h"
-// #include "widgets/intlabel.h"
 #include "globals.h"
 #include "awl/posedit.h"
 #include "gconfig.h"
-#include "midiport.h"
 #include "midiedit/drummap.h"
 #include "instruments/minstrument.h"
 
diff --git a/muse/muse/liste/listedit.cpp b/muse/muse/liste/listedit.cpp
index 3c9e7f8d..a7895968 100644
--- a/muse/muse/liste/listedit.cpp
+++ b/muse/muse/liste/listedit.cpp
@@ -14,7 +14,6 @@
 #include "shortcuts.h"
 #include "midi.h"
 #include "event.h"
-#include "midiport.h"
 #include "midictrl.h"
 #include "esettings.h"
 
diff --git a/muse/muse/midiport.h b/muse/muse/midiport.h
deleted file mode 100644
index 80319aad..00000000
--- a/muse/muse/midiport.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//=============================================================================
-//  MusE
-//  Linux Music Editor
-//  $Id:$
-//
-//  Copyright (C) 2002-2006 by Werner Schweer and others
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License version 2.
-//
-//  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; if not, write to the Free Software
-//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//=============================================================================
-
-#ifndef __MIDIPORT_H__
-#define __MIDIPORT_H__
-
-#endif
-
diff --git a/muse/muse/widgets/outportcombo.cpp b/muse/muse/widgets/outportcombo.cpp
index f919b7c9..0145ec66 100644
--- a/muse/muse/widgets/outportcombo.cpp
+++ b/muse/muse/widgets/outportcombo.cpp
@@ -19,7 +19,6 @@
 //=============================================================================
 
 #include "outportcombo.h"
-#include "midiport.h"
 #include "song.h"
 
 //---------------------------------------------------------