SF.net SVN: jazzplusplus:[1018] trunk/jazz/src/Configuration.cpp

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

Revision: 1018
          http://sourceforge.net/p/jazzplusplus/code/1018
Author:   pstieber
Date:     2013-04-07 23:54:34 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
Fixed reading of voice, drum set, and drum names.

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

Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp	2013-04-07 23:43:22 UTC (rev 1017)
+++ trunk/jazz/src/Configuration.cpp	2013-04-07 23:54:34 UTC (rev 1018)
@@ -863,10 +863,11 @@
 
           mVoiceNames[VoiceIndex + 1].second = Value + 1;
 
-          string VoiceName =
-            TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
+          string VoiceName;
+          getline(Iss, VoiceName);
 
-          mVoiceNames[VoiceIndex + 1].first = VoiceName;
+          mVoiceNames[VoiceIndex + 1].first =
+            TNStringUtilities::TrimLeadingAndTrailingBlanks(VoiceName);
 
           ++VoiceIndex;
         }
@@ -903,13 +904,11 @@
           mDrumSets[DrumsetIndex + 1].second = Value + 1;
 
           string SetName;
-          Iss >> SetName;
+          getline(Iss, SetName);
 
-          string DrumSetName =
-            TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
+          mDrumSets[DrumsetIndex + 1].first =
+            TNStringUtilities::TrimLeadingAndTrailingBlanks(SetName);
 
-          mDrumSets[DrumsetIndex + 1].first = DrumSetName;
-
           ++DrumsetIndex;
         }
         else
@@ -941,10 +940,11 @@
         Iss >> i;
         assert(0 <= i && i <= 127);
 
-        string DrumName =
-          TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
+        string DrumName;
+        getline(Iss, DrumName);
 
-        mDrumNames[i + 1].first = DrumName;
+        mDrumNames[i + 1].first =
+          TNStringUtilities::TrimLeadingAndTrailingBlanks(DrumName);
       }
       else
       {

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