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

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

Revision: 965
          http://sourceforge.net/p/jazzplusplus/code/965
Author:   pstieber
Date:     2013-03-17 23:07:39 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Updated to use std::string for file names.

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

Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp	2013-03-17 23:06:42 UTC (rev 964)
+++ trunk/jazz/src/Song.cpp	2013-03-17 23:07:39 UTC (rev 965)
@@ -170,7 +170,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZSong::Read(JZReadBase& Io, const char* pFileName)
+void JZSong::Read(JZReadBase& Io, const string& FileName)
 {
   int i;
   wxBeginBusyCursor();
@@ -178,7 +178,7 @@
   {
     mTracks[i].Clear();
   }
-  int n = Io.Open(pFileName);
+  int n = Io.Open(FileName);
   for (i = 0; i < n && i < eMaxTrackCount; ++i)
   {
     mTracks[i].Read(Io);
@@ -207,7 +207,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZSong::Write(JZWriteBase& Io, const char* pFileName)
+void JZSong::Write(JZWriteBase& Io, const string& FileName)
 {
   // Make sure track 0 has a synth reset
   if (!mTracks[0].mpReset)
@@ -217,7 +217,7 @@
   }
 
   int n = NumUsedTracks();
-  if (!Io.Open(pFileName, n, mTicksPerQuarter))
+  if (!Io.Open(FileName, n, mTicksPerQuarter))
   {
     return;
   }

Modified: trunk/jazz/src/Song.h
===================================================================
--- trunk/jazz/src/Song.h	2013-03-17 23:06:42 UTC (rev 964)
+++ trunk/jazz/src/Song.h	2013-03-17 23:07:39 UTC (rev 965)
@@ -94,9 +94,9 @@
 
     void Clear();
 
-    void Read(JZReadBase& Io, const char* pFileName = 0);
+    void Read(JZReadBase& Io, const std::string& FileName);
 
-    void Write(JZWriteBase& Io, const char* pFileName = 0);
+    void Write(JZWriteBase& Io, const std::string& FileName);
 
     JZTrack* GetTrack(int TrackIndex);
 

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