[Lmuse-cvs-traffic] muse/muse app.cpp, 1.113.2.42, 1.113.2.43 globals.cpp, 1.15.2.7, 1.15.2.8 globals.h, 1.10.2.7, 1.10.2.8 midiport.cpp, 1.21.2.6, 1.21.2.7

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16609/muse

Modified Files:
      Tag: REL07
	app.cpp globals.cpp globals.h midiport.cpp 
Log Message:
See ChangeLog

Index: midiport.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiport.cpp,v
retrieving revision 1.21.2.6
retrieving revision 1.21.2.7
diff -C2 -d -r1.21.2.6 -r1.21.2.7
*** midiport.cpp	5 Feb 2009 02:36:18 -0000	1.21.2.6
--- midiport.cpp	18 Feb 2009 04:51:17 -0000	1.21.2.7
***************
*** 516,519 ****
--- 516,521 ----
  bool MidiPort::sendEvent(const MidiPlayEvent& ev)
        {
+       //printf("MidiPort::sendEvent: portno:%d channel:%d type:%d dataA:%d dataB:%d\n", portno(), ev.channel(), ev.type(), ev.dataA(), ev.dataB());
+       
        if (ev.type() == ME_CONTROLLER) {
        
***************
*** 634,637 ****
--- 636,641 ----
  // printf("setHwCtrlState ch %d  ctrl %x  val %x\n", ch, ctrl, val);
        
+       //printf("MidiPort::setHwCtrlState: portno:%d ch:%d ctrl:%d val:%d\n", portno(), ch, ctrl, val);
+       
        // By T356. This will create a new value list if necessary, otherwise it returns the existing list. 
        MidiCtrlValList* vl = addManagedController(ch, ctrl);

Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.113.2.42
retrieving revision 1.113.2.43
diff -C2 -d -r1.113.2.42 -r1.113.2.43
*** app.cpp	2 Feb 2009 21:37:59 -0000	1.113.2.42
--- app.cpp	18 Feb 2009 04:51:17 -0000	1.113.2.43
***************
*** 1809,1814 ****
        fprintf(stderr, "useful environment variables:\n");
        fprintf(stderr, "   MUSE             override library and shared directories location\n");
!       fprintf(stderr, "   MUSEINSTRUMENTS  override shared instrument directory\n");
!       fprintf(stderr, "   MUSEHOME         override user home directory\n");
        }
  
--- 1809,1814 ----
        fprintf(stderr, "useful environment variables:\n");
        fprintf(stderr, "   MUSE             override library and shared directories location\n");
!       fprintf(stderr, "   MUSEHOME         override user home directory (HOME/)\n");
!       fprintf(stderr, "   MUSEINSTRUMENTS  override user instrument directory (MUSEHOME/muse_instruments)\n");
        }
  
***************
*** 1856,1862 ****
        //pyscript = new PyScript(argc,argv);
  
!       museUser = getenv("MUSEHOME");
!       if (museUser == 0)
!             museUser = getenv("HOME");
        QString museGlobal;
        const char* p = getenv("MUSE");
--- 1856,1865 ----
        //pyscript = new PyScript(argc,argv);
  
!       const char* mu = getenv("MUSEHOME");
!       if(mu)
!         museUser = QString(mu);
!       if(museUser.isEmpty())
!         museUser = QString(getenv("HOME"));
!             
        QString museGlobal;
        const char* p = getenv("MUSE");
***************
*** 1876,1884 ****
        configName  = QString(getenv("HOME")) + QString("/.MusE");
  
        const char* ins = getenv("MUSEINSTRUMENTS");
        if(ins)
!         museInstruments = ins;
!       if(museInstruments.isEmpty()) 
!         museInstruments = museGlobalShare + QString("/instruments");
  
  #ifdef HAVE_LASH
--- 1879,1889 ----
        configName  = QString(getenv("HOME")) + QString("/.MusE");
  
+       museInstruments = museGlobalShare + QString("/instruments");
+       
        const char* ins = getenv("MUSEINSTRUMENTS");
        if(ins)
!         museUserInstruments = QString(ins);
!       if(museUserInstruments.isEmpty())
!         museUserInstruments = museUser + QString("/muse_instruments");
  
  #ifdef HAVE_LASH
***************
*** 1989,1992 ****
--- 1994,1998 ----
              printf("muse home:        <%s>\n", museUser.latin1());
              printf("project dir:      <%s>\n", museProject.latin1());
+             printf("user instruments: <%s>\n", museUserInstruments.latin1());
              }
  

Index: globals.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/globals.cpp,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -d -r1.15.2.7 -r1.15.2.8
*** globals.cpp	18 Aug 2008 00:15:23 -0000	1.15.2.7
--- globals.cpp	18 Feb 2009 04:51:17 -0000	1.15.2.8
***************
*** 70,73 ****
--- 70,74 ----
  QString configName;
  QString museInstruments;
+ QString museUserInstruments;
  
  QString lastWavePath(".");

Index: globals.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/globals.h,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -C2 -d -r1.10.2.7 -r1.10.2.8
*** globals.h	18 Aug 2008 00:15:23 -0000	1.10.2.7
--- globals.h	18 Feb 2009 04:51:17 -0000	1.10.2.8
***************
*** 45,48 ****
--- 45,49 ----
  extern QString configName;
  extern QString museInstruments;
+ extern QString museUserInstruments;
  
  extern QString lastWavePath;