[Lmuse-cvs-traffic] muse/muse app.h,1.73,1.74 audio.cpp,1.107,1.108 audio.h,1.53,1.54 conf.cpp,1.73,1.74 midiport.cpp,1.87,1.88 midiseq.cpp,1.74,1.75 midiseq.h,1.18,1.19 midisynti.cpp,1.9,1.10 route.cpp,1.39,1.40 route.h,1.12,1.13 seqmsg.cpp,1.58,1.59 song.cpp,1.140,1.141 song.h,1.76,1.77 sync.cpp,1.14,1.15 transport.cpp,1.22,1.23 transport.h,1.15,1.16 transportbase.ui,1.4,1.5 undo.cpp,1.30,1.31 wave.cpp,1.31,1.32

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6148/muse

Modified Files:
	app.h audio.cpp audio.h conf.cpp midiport.cpp midiseq.cpp 
	midiseq.h midisynti.cpp route.cpp route.h seqmsg.cpp song.cpp 
	song.h sync.cpp transport.cpp transport.h transportbase.ui 
	undo.cpp wave.cpp 
Log Message:
nice updates!


Index: transport.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/transport.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** transport.h	3 Dec 2005 18:53:43 -0000	1.15
--- transport.h	5 Dec 2005 20:40:39 -0000	1.16
***************
*** 49,52 ****
--- 49,53 ----
        void setPlay(bool f);
        void syncButtonClicked(bool);
+       void syncChanged();
  
     public:

Index: undo.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/undo.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** undo.cpp	23 Nov 2005 13:55:32 -0000	1.30
--- undo.cpp	5 Dec 2005 20:40:39 -0000	1.31
***************
*** 297,303 ****
        {
        UndoOp i;
!       i.type    = type;
!       i.id = n;
!       i.track   = track;
        if (type == UndoOp::AddTrack)
              updateFlags |= SC_TRACK_INSERTED;
--- 297,303 ----
        {
        UndoOp i;
!       i.type   = type;
!       i.id     = n;
!       i.track  = track;
        if (type == UndoOp::AddTrack)
              updateFlags |= SC_TRACK_INSERTED;

Index: audio.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audio.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** audio.h	8 Jun 2005 14:53:43 -0000	1.53
--- audio.h	5 Dec 2005 20:40:39 -0000	1.54
***************
*** 210,214 ****
        void msgPlay(bool val);
  
!       void msgRemoveTrack(Track*, bool u = true);
        void msgRemoveTracks();
        void msgMoveTrack(Track*, Track*);
--- 210,214 ----
        void msgPlay(bool val);
  
!       void msgRemoveTrack(Track*);
        void msgRemoveTracks();
        void msgMoveTrack(Track*, Track*);

Index: conf.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** conf.cpp	4 Dec 2005 17:41:11 -0000	1.73
--- conf.cpp	5 Dec 2005 20:40:39 -0000	1.74
***************
*** 518,530 ****
  void MusE::configMidiSync()
        {
!       if (!midiSyncConfig)
              midiSyncConfig = new MidiSyncConfig(this);
  
!       if (midiSyncConfig->isVisible()) {
!           midiSyncConfig->raise();
! //TD          midiSyncConfig->setActiveWindow();
!           }
!       else
!             midiSyncConfig->show();
        }
  
--- 518,536 ----
  void MusE::configMidiSync()
        {
!       if (!midiSyncConfig) {
              midiSyncConfig = new MidiSyncConfig(this);
+             connect(midiSyncConfig, SIGNAL(syncChanged()), SLOT(syncChanged()));
+             }
+       midiSyncConfig->raise();
+       midiSyncConfig->show();
+       }
  
! //---------------------------------------------------------
! //   syncChanged
! //---------------------------------------------------------
! 
! void MusE::syncChanged()
!       {
!       transport->syncChanged();      
        }
  

Index: route.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/route.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** route.h	18 Nov 2005 16:51:14 -0000	1.12
--- route.h	5 Dec 2005 20:40:39 -0000	1.13
***************
*** 32,35 ****
--- 32,40 ----
        Route(Track*, int, RouteType);
        Route();
+       Route(const Route& r) {
+             track   = r.track;
+             channel = r.channel;
+             type    = r.type;
+             }
        QString name() const;
        bool operator==(const Route& a) const;

Index: midiseq.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiseq.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** midiseq.cpp	4 Dec 2005 17:41:11 -0000	1.74
--- midiseq.cpp	5 Dec 2005 20:40:39 -0000	1.75
***************
*** 69,73 ****
                    break;
              case SEQM_REMOVE_TRACK:
!                   song->cmdRemoveTrack(msg->track);
                    updatePollFd();
                    break;
--- 69,73 ----
                    break;
              case SEQM_REMOVE_TRACK:
!                   song->removeTrack2(msg->track);
                    updatePollFd();
                    break;
***************
*** 91,95 ****
                    break;
              default:
!                   printf("MidiSeq::processMsg() unknown id %d\n", msg->id);
                    break;
              }
--- 91,95 ----
                    break;
              default:
!                   song->processMsg(msg);
                    break;
              }

Index: midiport.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiport.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** midiport.cpp	4 Dec 2005 17:41:11 -0000	1.87
--- midiport.cpp	5 Dec 2005 20:40:39 -0000	1.88
***************
*** 154,161 ****
  void MidiOutPort::deactivate()
        {
!       for (iRoute i = _outRoutes.begin(); i != _outRoutes.end(); ++i) {
!             Route r = *i;
              midiDriver->disconnect(alsaPort, i->port);
-             }
        }
  
--- 154,159 ----
  void MidiOutPort::deactivate()
        {
!       for (ciRoute i = _outRoutes.begin(); i != _outRoutes.end(); ++i)
              midiDriver->disconnect(alsaPort, i->port);
        }
  
***************
*** 525,532 ****
  void MidiInPort::deactivate()
        {
!       for (iRoute i = _inRoutes.begin(); i != _inRoutes.end(); ++i) {
!             Route r = *i;
!             midiDriver->disconnect(r.port, alsaPort);
!             }
        }
  
--- 523,528 ----
  void MidiInPort::deactivate()
        {
!       for (ciRoute i = _inRoutes.begin(); i != _inRoutes.end(); ++i)
!             midiDriver->disconnect(i->port, alsaPort);
        }
  

Index: app.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** app.h	4 Dec 2005 17:41:11 -0000	1.73
--- app.h	5 Dec 2005 20:40:39 -0000	1.74
***************
*** 226,229 ****
--- 226,230 ----
        void mixer2Closed();
        void setRaster(int);
+       void syncChanged();
  
     public slots:

Index: song.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** song.cpp	4 Dec 2005 17:41:11 -0000	1.140
--- song.cpp	5 Dec 2005 20:40:39 -0000	1.141
***************
*** 90,106 ****
  
  //---------------------------------------------------------
- //   cmdRemoveTrack
- //    called from RT context (midiSeq)
- //---------------------------------------------------------
- 
- void Song::cmdRemoveTrack(Track* track)
-       {
-       int idx = _tracks.index(track);
-       undoOp(UndoOp::DeleteTrack, idx, track);
-       removeTrack2(track);
-       updateFlags |= SC_TRACK_REMOVED;
-       }
- 
- //---------------------------------------------------------
  //   removeMarkedTracks
  //---------------------------------------------------------
--- 90,93 ----
***************
*** 1651,1655 ****
  void Song::insertTrack2(Track* track)
        {
-       int n;
        switch(track->type()) {
              case Track::MIDI_SYNTI:
--- 1638,1641 ----
***************
*** 1706,1710 ****
        //
  
!       n = _auxs.size();
        if (n) {
              for (iTrack i = _tracks.begin(); i != _tracks.end(); ++i) {
--- 1692,1696 ----
        //
  
!       int n = _auxs.size();
        if (n) {
              for (iTrack i = _tracks.begin(); i != _tracks.end(); ++i) {
***************
*** 1727,1745 ****
        if (track->type() == Track::AUDIO_OUTPUT || track->type() == Track::MIDI_OUT) {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->outRoutes()->push_back(src);
              }
        else if (track->type() == Track::AUDIO_INPUT || track->type() == Track::MIDI_IN) {
              const RouteList* rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->inRoutes()->push_back(src);
              }
        else {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->outRoutes()->push_back(src);
              rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->inRoutes()->push_back(src);
              }
        }
--- 1713,1739 ----
        if (track->type() == Track::AUDIO_OUTPUT || track->type() == Track::MIDI_OUT) {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->outRoutes()->push_back(src);
+                   }
              }
        else if (track->type() == Track::AUDIO_INPUT || track->type() == Track::MIDI_IN) {
              const RouteList* rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->inRoutes()->push_back(src);
+                   }
              }
        else {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->outRoutes()->push_back(src);
+                   }
              rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->inRoutes()->push_back(src);
+                   }
              }
        }
***************
*** 1752,1759 ****
  void Song::removeTrack(Track* track)
        {
        removeTrack1(track);
        audio->msgRemoveTrack(track);
        removeTrack3(track);
!       update(SC_TRACK_REMOVED | SC_ROUTE);
        }
  
--- 1746,1756 ----
  void Song::removeTrack(Track* track)
        {
+       startUndo();
+       int idx = _tracks.index(track);
+       undoOp(UndoOp::DeleteTrack, idx, track);
        removeTrack1(track);
        audio->msgRemoveTrack(track);
        removeTrack3(track);
!       endUndo(SC_TRACK_REMOVED | SC_ROUTE);
        }
  
***************
*** 1765,1769 ****
  void Song::removeTrack1(Track* track)
        {
!       track->deactivate();
        _tracks.erase(track);
        }
--- 1762,1767 ----
  void Song::removeTrack1(Track* track)
        {
!       if (track->type() != Track::MIDI_OUT && track->type() != Track::MIDI_IN)
!             track->deactivate();
        _tracks.erase(track);
        }
***************
*** 1784,1790 ****
--- 1782,1790 ----
                    break;
              case Track::MIDI_OUT:
+                   track->deactivate();
                    _midiOutPorts.erase(track);
                    break;
              case Track::MIDI_IN:
+                   track->deactivate();
                    _midiInPorts.erase(track);
                    break;
***************
*** 1823,1847 ****
        if (track->type() == Track::AUDIO_SOFTSYNTH)
              src.type = Route::SYNTIPORT;
!       if (track->type() == Track::AUDIO_OUTPUT) {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->outRoutes()->removeRoute(src);
              }
!       else if (track->type() == Track::AUDIO_INPUT) {
              const RouteList* rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
                    r->track->inRoutes()->removeRoute(src);
              }
        else {
              const RouteList* rl = track->inRoutes();
              for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   r->dump();
                    r->track->outRoutes()->removeRoute(src);
                    }
              rl = track->outRoutes();
              for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
                    r->track->inRoutes()->removeRoute(src);
-                   printf("remove route from in:\n");
-                   r->dump();
                    }
              }
--- 1823,1850 ----
        if (track->type() == Track::AUDIO_SOFTSYNTH)
              src.type = Route::SYNTIPORT;
!       if (track->type() == Track::AUDIO_OUTPUT || track->type() == Track::MIDI_OUT) {
              const RouteList* rl = track->inRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->outRoutes()->removeRoute(src);
+                   }
              }
!       else if (track->type() == Track::AUDIO_INPUT || track->type() == Track::MIDI_IN) {
              const RouteList* rl = track->outRoutes();
!             for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->inRoutes()->removeRoute(src);
+                   }
              }
        else {
              const RouteList* rl = track->inRoutes();
              for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
!                   src.channel = r->channel;
                    r->track->outRoutes()->removeRoute(src);
                    }
              rl = track->outRoutes();
              for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
+                   src.channel = r->channel;
                    r->track->inRoutes()->removeRoute(src);
                    }
              }

Index: midisynti.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midisynti.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** midisynti.cpp	28 Nov 2005 18:39:27 -0000	1.9
--- midisynti.cpp	5 Dec 2005 20:40:39 -0000	1.10
***************
*** 178,182 ****
        if (data) {
              _synti->setInitData(len, data);
!             delete data;
              }
        song->insertTrack0(this, -1);
--- 178,182 ----
        if (data) {
              _synti->setInitData(len, data);
!             delete[] data;
              }
        song->insertTrack0(this, -1);

Index: seqmsg.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/seqmsg.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** seqmsg.cpp	18 Nov 2005 16:51:14 -0000	1.58
--- seqmsg.cpp	5 Dec 2005 20:40:39 -0000	1.59
***************
*** 327,336 ****
  //---------------------------------------------------------
  
! void Audio::msgRemoveTrack(Track* track, bool doUndoFlag)
        {
        AudioMsg msg;
        msg.id = SEQM_REMOVE_TRACK;
        msg.track = track;
!       sendMessage(&msg, doUndoFlag);
        }
  
--- 327,336 ----
  //---------------------------------------------------------
  
! void Audio::msgRemoveTrack(Track* track)
        {
        AudioMsg msg;
        msg.id = SEQM_REMOVE_TRACK;
        msg.track = track;
!       sendMessage(&msg, false);
        }
  
***************
*** 349,353 ****
                    if ((*t)->selected()) {
                          song->removeTrack1(*t);
!                         msgRemoveTrack(*t, false);
                          song->removeTrack3(*t);
                          loop = true;
--- 349,353 ----
                    if ((*t)->selected()) {
                          song->removeTrack1(*t);
!                         msgRemoveTrack(*t);
                          song->removeTrack3(*t);
                          loop = true;

Index: sync.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/sync.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sync.cpp	3 Dec 2005 18:53:43 -0000	1.14
--- sync.cpp	5 Dec 2005 20:40:39 -0000	1.15
***************
*** 4,8 ****
  //  $Id$
  //
! //  (C) Copyright 2003 Werner Schweer (ws...@se...)
  //=========================================================
  
--- 4,8 ----
  //  $Id$
  //
! //  (C) Copyright 2005 Werner Schweer (ws...@se...)
  //=========================================================
  
***************
*** 20,23 ****
--- 20,24 ----
  int rxSyncPort = -1;         // receive from all ports
  int txSyncPort = 1;
+ 
  int rxDeviceId = 0x7f;       // ´any´ device
  int txDeviceId = 0x7f;       // ´any´ device
***************
*** 42,45 ****
--- 43,59 ----
  static int mcStartTick;
  
+ enum {
+       MMC_STOP = 1,
+       MMC_PLAY = 2,
+       MMC_DEFERRED_PLAY = 3,
+       MMC_FAST_FORWARD = 4,
+       MMC_REWIND = 5,
+       MMC_RECORD_STROBE = 6,  // Punch In
+       MMC_RECORD_EXIT = 7,    // Punch Out
+       MMC_PAUSE = 9,
+       MMC_RESET = 13,
+       MMC_GOTO = 0x44
+       };
+ 
  //---------------------------------------------------------
  //  mmcInput
***************
*** 47,60 ****
  //---------------------------------------------------------
  
! void MidiSeq::mmcInput(const unsigned char* p, int n)
        {
! 	printf("mmcInput: n:%d %02x %02x %02x %02x\n",
!                n, p[2], p[3], p[4], p[5]);
! 
! //      if (!(extSyncFlag && acceptMMC))
!       if (!acceptMMC)
              return;
!       switch(p[3]) {
!             case 1:
                    if (debugSync)
                          printf("  MMC: STOP\n");
--- 61,74 ----
  //---------------------------------------------------------
  
! void MidiSeq::mmcInput(int id, int cmd, const Pos& pos)
        {
!       if (!extSyncFlag || !acceptMMC || (id != 127 && id != rxDeviceId))
              return;
! 
!       if (debugMsg)
!       	printf("mmcInput: id %d cmd %02x %02x\n", id, cmd, cmd);
! 
!       switch (cmd) {
!             case MMC_STOP:
                    if (debugSync)
                          printf("  MMC: STOP\n");
***************
*** 65,123 ****
  				audio->sendMsgToGui(MSG_STOP);
                    break;
!             case 2:
!                   if (debugSync)
!                         printf("  MMC: PLAY\n");
!             case 3:
!                   if (debugSync)
!                         printf("  MMC: DEFERRED PLAY\n");
! //                  mtcState = 0;
! //                  mtcValid = false;
! //                  mtcLost  = 0;
! //                  mtcSync  = false;
              	audioDriver->startTransport();
                    break;
!             case 4:
                    printf("MMC: FF not implemented\n");
                    break;
!             case 5:
                    printf("MMC: REWIND not implemented\n");
                    break;
!             case 6:
                    printf("MMC: REC STROBE not implemented\n");
                    break;
!             case 7:
                    printf("MMC: REC EXIT not implemented\n");
                    break;
!             case 9:
  			audio->sendMsgToGui(MSG_RECORD);
              	break;
!             case 0xd:
                    printf("MMC: RESET not implemented\n");
                    break;
-             case 0x44:
-                   if (p[5] == 0) {
-                         printf("MMC: LOCATE IF not implemented\n");
-                         break;
-                         }
- #if 0 //TD
-                   else if (p[5] == 1) {
-                         MTC mtc(p[6] & 0x1f, p[7], p[8], p[9], p[10]);
-                         int mmcPos = tempomap.frame2tick(lrint(mtc.time()*sampleRate));
  
!                         Pos tp(mmcPos, true);
!                         seek(tp);
!                         if (debugSync) {
!                               printf("MMC: %f %d seek ",
!                                  mtc.time(), mmcPos);
!                               mtc.print();
!                               printf("\n");
!                               }
!                         sendMsgToGui(MSG_SEEK);
!                         break;
!                         }
! #endif
!                   // fall through
              default:
!                   printf("MMC %x %x, unknown\n", p[3], p[4]); break;
              }
        }
--- 79,112 ----
  				audio->sendMsgToGui(MSG_STOP);
                    break;
!             case MMC_PLAY:
!             case MMC_DEFERRED_PLAY:
              	audioDriver->startTransport();
                    break;
!             case MMC_FAST_FORWARD:
                    printf("MMC: FF not implemented\n");
                    break;
!             case MMC_REWIND:
                    printf("MMC: REWIND not implemented\n");
                    break;
!             case MMC_RECORD_STROBE:
                    printf("MMC: REC STROBE not implemented\n");
                    break;
!             case MMC_RECORD_EXIT:
                    printf("MMC: REC EXIT not implemented\n");
                    break;
!             case MMC_PAUSE:
  			audio->sendMsgToGui(MSG_RECORD);
              	break;
!             case MMC_RESET:
                    printf("MMC: RESET not implemented\n");
                    break;
  
!             case MMC_GOTO:
!                   audioDriver->seekTransport(pos.frame());
!                   break;
! 
              default:
!                   printf("MMC id %x cmd %x, unknown\n", id, cmd);
!                   break;
              }
        }

Index: wave.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/wave.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wave.cpp	20 Nov 2005 14:13:41 -0000	1.31
--- wave.cpp	5 Dec 2005 20:40:39 -0000	1.32
***************
*** 34,37 ****
--- 34,38 ----
  SndFile::SndFile(const QString& name)
        {
+       refCount = 0;
        finfo.setFile(name);
        sf    = 0;
***************
*** 931,935 ****
  SndFileR::~SndFileR()
        {
!       if (sf && --(sf->refCount) == 0)
              delete sf;
        }
--- 932,936 ----
  SndFileR::~SndFileR()
        {
!       if (sf && --(sf->refCount) <= 0)
              delete sf;
        }

Index: route.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/route.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** route.cpp	4 Dec 2005 17:41:11 -0000	1.39
--- route.cpp	5 Dec 2005 20:40:39 -0000	1.40
***************
*** 420,425 ****
        Route s = name2route(src, stype);
        Route d = name2route(dst, dtype);
!       if (s.isValid() && d.isValid())
!             addRoute(s, d);
        }
  
--- 420,424 ----
        Route s = name2route(src, stype);
        Route d = name2route(dst, dtype);
!       addRoute(s, d);
        }
  

Index: midiseq.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiseq.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** midiseq.h	3 Dec 2005 18:53:43 -0000	1.18
--- midiseq.h	5 Dec 2005 20:40:39 -0000	1.19
***************
*** 14,17 ****
--- 14,22 ----
  #include "driver/rtctimer.h"
  
+ namespace AL {
+       class Pos;
+       };
+ class AL::Pos;
+ 
  class MPEventList;
  class SynthI;
***************
*** 65,69 ****
        void mtcInputQuarter(int, unsigned char);
        void setSongPosition(int, int);
!       void mmcInput(const unsigned char* p, int n);
  
        void msgMsg(int id);
--- 70,74 ----
        void mtcInputQuarter(int, unsigned char);
        void setSongPosition(int, int);
!       void mmcInput(int id, int cmd, const AL::Pos&);
  
        void msgMsg(int id);

Index: song.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/song.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** song.h	20 Nov 2005 14:13:41 -0000	1.76
--- song.h	5 Dec 2005 20:40:39 -0000	1.77
***************
*** 247,251 ****
        bool trackExists(Track*) const;
  
-       void cmdRemoveTrack(Track* track);
        void removeTrack(Track* track);
        void removeTrack1(Track* track);
--- 247,250 ----

Index: transportbase.ui
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/transportbase.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** transportbase.ui	23 Nov 2005 13:55:32 -0000	1.4
--- transportbase.ui	5 Dec 2005 20:40:39 -0000	1.5
***************
*** 10,14 ****
      <y>0</y>
      <width>619</width>
!     <height>152</height>
     </rect>
    </property>
--- 10,14 ----
      <y>0</y>
      <width>619</width>
!     <height>103</height>
     </rect>
    </property>
***************
*** 128,132 ****
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>0</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
--- 128,132 ----
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>5</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
***************
*** 135,139 ****
         </property>
         <property name="text" >
!         <string>...</string>
         </property>
         <property name="checkable" >
--- 135,139 ----
         </property>
         <property name="text" >
!         <string>MOP</string>
         </property>
         <property name="checkable" >
***************
*** 146,150 ****
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>0</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
--- 146,150 ----
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>5</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
***************
*** 164,168 ****
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>0</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
--- 164,168 ----
         <property name="sizePolicy" >
          <sizepolicy>
!          <hsizetype>5</hsizetype>
           <vsizetype>7</vsizetype>
           <horstretch>0</horstretch>
***************
*** 176,179 ****
--- 176,185 ----
          <bool>true</bool>
         </property>
+        <property name="toolButtonStyle" >
+         <enum>Qt::ToolButtonTextOnly</enum>
+        </property>
+        <property name="arrowType" >
+         <enum>Qt::NoArrow</enum>
+        </property>
        </widget>
       </item>
***************
*** 792,797 ****
          </sizepolicy>
         </property>
         <property name="text" >
!         <string>Master</string>
         </property>
         <property name="checkable" >
--- 798,806 ----
          </sizepolicy>
         </property>
+        <property name="toolTip" >
+         <string>use tempo map</string>
+        </property>
         <property name="text" >
!         <string>Tempomap</string>
         </property>
         <property name="checkable" >

Index: audio.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audio.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** audio.cpp	4 Dec 2005 17:41:11 -0000	1.107
--- audio.cpp	5 Dec 2005 20:40:39 -0000	1.108
***************
*** 493,515 ****
                    break;
  
-             case SEQM_RESET_DEVICES:
-             case SEQM_ADD_TRACK:
-             case SEQM_REMOVE_TRACK:
-             case SEQM_ADD_PART:
-             case SEQM_REMOVE_PART:
-             case SEQM_CHANGE_PART:
-             case SEQM_MOVE_TRACK:
-             case MS_SET_RTC:
-             case AUDIO_ADDMIDIPLUGIN:
-                   midiSeq->sendMsg(msg);
-                   break;
- 
              case SEQM_IDLE:
                    idle = msg->a;
!                   midiSeq->sendMsg(msg);
!                   break;
! 
              default:
!                   song->processMsg(msg);
                    break;
              }
--- 493,501 ----
                    break;
  
              case SEQM_IDLE:
                    idle = msg->a;
!                   // fall through
              default:
!                   midiSeq->sendMsg(msg);
                    break;
              }

Index: transport.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/transport.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** transport.cpp	3 Dec 2005 18:53:43 -0000	1.22
--- transport.cpp	5 Dec 2005 20:40:39 -0000	1.23
***************
*** 396,400 ****
  void Transport::syncButtonClicked(bool flag)
        {
! 	extSyncFlag = flag;      
        }
  
--- 396,409 ----
  void Transport::syncButtonClicked(bool flag)
        {
! 	extSyncFlag = flag;
!       }
! 
! //---------------------------------------------------------
! //   syncChanged
! //---------------------------------------------------------
! 
! void Transport::syncChanged()
!       {
!       syncButton->setChecked(extSyncFlag);
        }