SF.net SVN: jazzplusplus:[728] trunk/jazz/src

[<pst...@us...>]

Revision: 728
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=728&view=rev
Author:   pstieber
Date:     2009-06-21 20:03:06 +0000 (Sun, 21 Jun 2009)

Log Message:
-----------
1. Changed mCtrlNames to mControlNames.
2. Fixed the reading of the control names.

Modified Paths:
--------------
    trunk/jazz/src/Configuration.cpp
    trunk/jazz/src/Configuration.h

Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp	2009-06-21 19:45:17 UTC (rev 727)
+++ trunk/jazz/src/Configuration.cpp	2009-06-21 20:03:06 UTC (rev 728)
@@ -124,7 +124,7 @@
   : mFileName(),
     mDrumNames(),
     mDrumSets(),
-    mCtrlNames(),
+    mControlNames(),
     mVoiceNames(),
     mBankTable()
 {
@@ -344,7 +344,7 @@
 
   for (int i = 0; i < 130; ++i)
   {
-    mCtrlNames.push_back(make_pair("", i));
+    mControlNames.push_back(make_pair("", i));
   }
 
   mVoiceNames.push_back(make_pair(pNoneString, 0));
@@ -392,8 +392,8 @@
 //-----------------------------------------------------------------------------
 const pair<string, int>& JZConfiguration::GetCtrlName(unsigned Entry) const
 {
-   assert((Entry >= 0) && (Entry < mCtrlNames.size()));
-   return mCtrlNames[Entry];
+   assert((Entry >= 0) && (Entry < mControlNames.size()));
+   return mControlNames[Entry];
 }
 
 //-----------------------------------------------------------------------------
@@ -795,7 +795,7 @@
           pVector = &mDrumSets;
           break;
         case C_CtrlNames:
-          pVector = &mCtrlNames;
+          pVector = &mControlNames;
           break;
         case C_DrumNames:
           pVector = &mDrumNames;
@@ -916,7 +916,7 @@
             << endl;
         }
       }
-      else if (pVector == &mCtrlNames)
+      else if (pVector == &mControlNames)
       {
         // Controller names.
 
@@ -924,10 +924,11 @@
         Iss >> i;
         assert(0 <= i && i <= 127);
 
-        string ControllerName =
-          TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
+        string ControllerName;
+        getline(Iss, ControllerName);
 
-        mCtrlNames[i + 1].first = ControllerName;
+        mControlNames[i + 1].first =
+          TNStringUtilities::TrimLeadingAndTrailingBlanks(ControllerName);
       }
       else if (pVector == &mDrumNames)
       {

Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h	2009-06-21 19:45:17 UTC (rev 727)
+++ trunk/jazz/src/Configuration.h	2009-06-21 20:03:06 UTC (rev 728)
@@ -270,7 +270,7 @@
 
     std::vector<std::pair<std::string, int> > mDrumSets;
 
-    std::vector<std::pair<std::string, int> > mCtrlNames;
+    std::vector<std::pair<std::string, int> > mControlNames;
 
     std::vector<std::pair<std::string, int> > mVoiceNames;
 
@@ -323,7 +323,7 @@
 const std::vector<std::pair<std::string, int> >&
 JZConfiguration::GetControlNames() const
 {
-  return mCtrlNames;
+  return mControlNames;
 }
 
 //-----------------------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.