[Lmuse-cvs-traffic] muse/muse app.cpp,1.171,1.172 conf.cpp,1.57,1.58 gconfig.cpp,1.21,1.22 track.cpp,1.78,1.79 track.h,1.92,1.93

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

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

Modified Files:
	app.cpp conf.cpp gconfig.cpp track.cpp track.h 
Log Message:
misc


Index: track.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/track.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** track.cpp	6 Jun 2005 14:19:22 -0000	1.78
--- track.cpp	14 Jun 2005 21:15:32 -0000	1.79
***************
*** 417,425 ****
        ciCtrl i = controller()->find(id);
        if (i == controller()->end()) {
!             printf("%s(%s)::getController(%d) size %d: not found\n",
!                cname().latin1(), name().latin1(), id, controller()->size());
!             const CtrlList* cl = controller();
!             for (ciCtrl i = cl->begin(); i != cl->end(); ++i)
!                   printf("   Ctrl %d\n", i->first);
              return 0;
              }
--- 417,425 ----
        ciCtrl i = controller()->find(id);
        if (i == controller()->end()) {
! //            printf("%s(%s)::getController(%d) size %d: not found\n",
! //               cname().latin1(), name().latin1(), id, controller()->size());
! //            const CtrlList* cl = controller();
! //            for (ciCtrl i = cl->begin(); i != cl->end(); ++i)
! //                  printf("   Ctrl %d\n", i->first);
              return 0;
              }

Index: gconfig.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/gconfig.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gconfig.cpp	6 May 2005 15:02:06 -0000	1.21
--- gconfig.cpp	14 Jun 2005 21:15:32 -0000	1.22
***************
*** 94,106 ****
        {
        QRect(0, 0, 300, 500),        // Mixer1
!       true, true, true, true, true,
        true, true, true, true, true
              },
        {
        QRect(200, 200, 300, 500),    // Mixer2
!       true, true, true, true, true,
        true, true, true, true, true
              },
!       true,                         // TransportVisible
        false,                        // BigTimeVisible;
        false,                        // mixerVisible1;
--- 94,106 ----
        {
        QRect(0, 0, 300, 500),        // Mixer1
!       false, true, true, true, true,
        true, true, true, true, true
              },
        {
        QRect(200, 200, 300, 500),    // Mixer2
!       false, true, true, true, true,
        true, true, true, true, true
              },
!       false,                        // TransportVisible
        false,                        // BigTimeVisible;
        false,                        // mixerVisible1;

Index: track.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/track.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** track.h	11 Jun 2005 11:39:15 -0000	1.92
--- track.h	14 Jun 2005 21:15:32 -0000	1.93
***************
*** 41,45 ****
  typedef struct snd_seq_event snd_seq_event_t;
  
! static const int EVENT_FIFO_SIZE = 32;
  
  class SFrame;
--- 41,45 ----
  typedef struct snd_seq_event snd_seq_event_t;
  
! static const int EVENT_FIFO_SIZE = 128;
  
  class SFrame;

Index: conf.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** conf.cpp	12 Jun 2005 09:22:52 -0000	1.57
--- conf.cpp	14 Jun 2005 21:15:31 -0000	1.58
***************
*** 674,677 ****
--- 674,679 ----
              else if (tag == "showMidiTracks")
                    showMidiTracks = i;
+             else if (tag == "showMidiSyntiPorts")
+                   showMidiSyntiPorts = i;
              else if (tag == "showOutputTracks")
                    showOutputTracks = i;

Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** app.cpp	12 Jun 2005 09:22:52 -0000	1.171
--- app.cpp	14 Jun 2005 21:15:31 -0000	1.172
***************
*** 1146,1151 ****
  bool MusE::save()
        {
!       if (project.baseName() == "untitled")
              return saveAs();
        else
              return save(project.filePath(), false);
--- 1146,1153 ----
  bool MusE::save()
        {
!       if (project.baseName() == "untitled"
!          || (!project.extension(false).isEmpty() && project.extension(false) != "med")) {
              return saveAs();
+             }
        else
              return save(project.filePath(), false);