SF.net SVN: jazzplusplus:[883] trunk/jazz/src/Player.h

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

Revision: 883
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=883&view=rev
Author:   pstieber
Date:     2011-08-05 20:20:39 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
1. Reordered include files.
2. Changed std::string to wxString.
3. Updated a comment.

Modified Paths:
--------------
    trunk/jazz/src/Player.h

Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h	2011-08-05 19:53:28 UTC (rev 882)
+++ trunk/jazz/src/Player.h	2011-08-05 20:20:39 UTC (rev 883)
@@ -23,8 +23,6 @@
 #ifndef JZ_PLAYER_H
 #define JZ_PLAYER_H
 
-#include <wx/timer.h>
-
 #include "config.h"
 #include "Events.h"
 #include "Track.h"
@@ -32,6 +30,8 @@
 //#include "midinet.h"
 #include "Audio.h"
 
+#include <wx/timer.h>
+
 #include <sys/types.h>
 #include <time.h>
 
@@ -62,13 +62,13 @@
       return mDeviceNames.size();
     }
 
-    const std::string& GetName(unsigned i) const
+    const wxString& GetName(unsigned i) const
     {
       if (i < mDeviceNames.size())
       {
         return mDeviceNames[i];
       }
-      static std::string Unknown("Unknown");
+      static wxString Unknown("Unknown");
       return Unknown;
     }
 
@@ -85,11 +85,11 @@
 
   protected:
 
-    std::vector<std::string> mDeviceNames;
+    std::vector<wxString> mDeviceNames;
 
   private:
 
-    // Prevent accidental copy or assignment.
+    // Hidden and unimplemented to prevent accidental copy or assignment.
     JZDeviceList(const JZDeviceList &);
     JZDeviceList& operator = (const JZDeviceList &);
 };


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