[Lmuse-cvs-traffic] muse/muse app.cpp,1.199,1.200 ctrl.cpp,1.28,1.29 ctrl.h,1.26,1.27 route.cpp,1.36,1.37

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

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

Modified Files:
	app.cpp ctrl.cpp ctrl.h route.cpp 
Log Message:
every fix creates two new bugs :-(


Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** app.cpp	14 Nov 2005 20:05:36 -0000	1.199
--- app.cpp	15 Nov 2005 21:13:53 -0000	1.200
***************
*** 195,198 ****
--- 195,204 ----
        audioPrefetch->start();
        audio->start();
+       //
+       // don connections
+       //
+       TrackList* tl = song->tracks();
+       for (iTrack i = tl->begin(); i != tl->end(); ++i)
+             (*i)->activate();
        }
  
***************
*** 987,997 ****
              }
        loadProjectFile1(name, songTemplate, loadAll);
!       if (restartSequencer) {
              seqStart();
-             }
-       TrackList* tl = song->tracks();
-       for (iTrack i = tl->begin(); i != tl->end(); ++i) {
-             (*i)->activate();
-             }
        audio->msgSeek(song->cPos());
        }
--- 993,998 ----
              }
        loadProjectFile1(name, songTemplate, loadAll);
!       if (restartSequencer)
              seqStart();
        audio->msgSeek(song->cPos());
        }
***************
*** 1841,1845 ****
        MuseApplication app(argc, argv);
  
- 
        config.fonts[0] = new QFont(QString("arial"), 10, QFont::Normal);
        config.fonts[1] = new QFont(QString("arial"),  8, QFont::Normal);
--- 1842,1845 ----

Index: ctrl.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/ctrl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ctrl.cpp	11 Nov 2005 22:21:44 -0000	1.28
--- ctrl.cpp	15 Nov 2005 21:13:53 -0000	1.29
***************
*** 26,29 ****
--- 26,30 ----
        _curVal.f   = 0.0f;
        _schedVal.f = 0.0f;
+       _schedValRaw.f = 0.0f;
        _touched    = false;
        _changed    = false;
***************
*** 39,43 ****
        _default.f  = 0.0f;
        _curVal.f   = 0.0f;
!       _schedVal.f = 0.0f;
        _touched    = false;
        _changed    = false;
--- 40,44 ----
        _default.f  = 0.0f;
        _curVal.f   = 0.0f;
!       _schedValRaw.f = 0.0f;
        _touched    = false;
        _changed    = false;
***************
*** 51,55 ****
        _default.f  = 0.0f;
        _curVal.f   = 0.0f;
!       _schedVal.f = 0.0f;
        _touched    = false;
        _changed    = false;
--- 52,56 ----
        _default.f  = 0.0f;
        _curVal.f   = 0.0f;
!       _schedValRaw.f = 0.0f;
        _touched    = false;
        _changed    = false;
***************
*** 63,67 ****
        _default.i  = mc->initVal();
        _curVal.i   = CTRL_VAL_UNKNOWN;
!       _schedVal.i = CTRL_VAL_UNKNOWN;
        _name       = mc->name();
        _touched    = false;
--- 64,68 ----
        _default.i  = mc->initVal();
        _curVal.i   = CTRL_VAL_UNKNOWN;
!       _schedValRaw.i = CTRL_VAL_UNKNOWN;
        _name       = mc->name();
        _touched    = false;
***************
*** 168,174 ****
        if (_type & LOG) {
              if (val.f <= 0.0)
!                   val.f = -1000.0f;
              else
!                   val.f = fast_log10(val.f);
              }
        _schedVal = val;
--- 169,178 ----
        if (_type & LOG) {
              if (val.f <= 0.0)
!                   _schedValRaw.f = -1000.0f;
              else
!                   _schedValRaw.f = fast_log10(val.f);
!             }
!       else {
!             _schedValRaw = val;
              }
        _schedVal = val;

Index: route.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/route.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** route.cpp	15 Nov 2005 18:14:31 -0000	1.36
--- route.cpp	15 Nov 2005 21:13:53 -0000	1.37
***************
*** 476,480 ****
                    }
              else if (type == AUDIOPORT) {
!                   return audioDriver->equal(port, a.port);
                    }
              }
--- 476,480 ----
                    }
              else if (type == AUDIOPORT) {
!                   return channel == a.channel && audioDriver->equal(port, a.port);
                    }
              }

Index: ctrl.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/ctrl.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ctrl.h	11 Nov 2005 22:21:44 -0000	1.26
--- ctrl.h	15 Nov 2005 21:13:53 -0000	1.27
***************
*** 128,131 ****
--- 128,132 ----
                          //   midi devices
        CVal _schedVal;   // used by gui to determine "current" value
+       CVal _schedValRaw;
        CVal min, max;
        bool _changed;
***************
*** 151,164 ****
        void setCurVal(float v) {
              _curVal.f = v;
!             _schedVal.f = v;
              }
        void setCurVal(int v) {
              _curVal.i = v;
              _schedVal.i = v;
              }
  
!       void setSchedVal(int v)        { _schedVal.i = v; }
        void setSchedVal(CVal v);
!       CVal schedVal()                { return _schedVal; }
  
        int id() const                 { return _id;      }
--- 152,172 ----
        void setCurVal(float v) {
              _curVal.f = v;
!             CVal val;
!             val.f = v;
!             setSchedVal(val);
              }
        void setCurVal(int v) {
              _curVal.i = v;
              _schedVal.i = v;
+             _schedValRaw.i = v;
              }
  
!       void setSchedVal(int v)        { 
!             _schedVal.i = v; 
!             _schedValRaw.i = v; 
!             }
        void setSchedVal(CVal v);
!       CVal schedVal() const          { return _schedVal; }
!       CVal schedValRaw() const       { return _schedValRaw; }
  
        int id() const                 { return _id;      }