[stdstring] get rid of CStdString in cores/IPlayer and children

diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
index 62a4630..9742006 100644 (file)
--- a/xbmc/ApplicationPlayer.cpp
+++ b/xbmc/ApplicationPlayer.cpp
@@ -150,7 +150,7 @@ int CApplicationPlayer::GetChapterCount()
     return 0;
 }
 
-void CApplicationPlayer::GetChapterName(CStdString& strChapterName)
+void CApplicationPlayer::GetChapterName(std::string& strChapterName)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
@@ -262,7 +262,7 @@ void CApplicationPlayer::SeekTime(int64_t iTime)
     player->SeekTime(iTime);
 }
 
-CStdString CApplicationPlayer::GetPlayingTitle()
+std::string CApplicationPlayer::GetPlayingTitle()
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
@@ -422,7 +422,7 @@ void CApplicationPlayer::DoAudioWork()
     player->DoAudioWork();
 }
 
-CStdString CApplicationPlayer::GetPlayerState()
+std::string CApplicationPlayer::GetPlayerState()
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
@@ -443,7 +443,7 @@ bool CApplicationPlayer::GetStreamDetails(CStreamDetails &details)
   return (player && player->GetStreamDetails(details));
 }
 
-bool CApplicationPlayer::SetPlayerState(CStdString state)
+bool CApplicationPlayer::SetPlayerState(const std::string& state)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   return (player && player->SetPlayerState(state));
@@ -527,7 +527,7 @@ void CApplicationPlayer::SetSubtitleVisible(bool bVisible)
     player->SetSubtitleVisible(bVisible);
 }
 
-int  CApplicationPlayer::AddSubtitle(const CStdString& strSubPath)
+int  CApplicationPlayer::AddSubtitle(const std::string& strSubPath)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
@@ -584,21 +584,21 @@ void CApplicationPlayer::GetSubtitleCapabilities(std::vector<int> &subCaps)
     player->GetSubtitleCapabilities(subCaps);
 }
 
-void CApplicationPlayer::GetAudioInfo( CStdString& strAudioInfo)
+void CApplicationPlayer::GetAudioInfo(std::string& strAudioInfo)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
     player->GetAudioInfo(strAudioInfo);
 }
 
-void CApplicationPlayer::GetVideoInfo( CStdString& strVideoInfo)
+void CApplicationPlayer::GetVideoInfo(std::string& strVideoInfo)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)
     player->GetVideoInfo(strVideoInfo);
 }
 
-void CApplicationPlayer::GetGeneralInfo( CStdString& strVideoInfo)
+void CApplicationPlayer::GetGeneralInfo(std::string& strVideoInfo)
 {
   boost::shared_ptr<IPlayer> player = GetInternal();
   if (player)

diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h
index 53be002..964570c 100644 (file)
--- a/xbmc/ApplicationPlayer.h
+++ b/xbmc/ApplicationPlayer.h
@@ -80,14 +80,14 @@ public:
   void SetPlaySpeed(int iSpeed, bool bApplicationMuted);
 
   // proxy calls
-  int   AddSubtitle(const CStdString& strSubPath);
+  int   AddSubtitle(const std::string& strSubPath);
   bool  CanPause();
   bool  CanRecord();
   bool  CanSeek();
   bool  ControlsVolume() const;
   void  DoAudioWork();
   void  GetAudioCapabilities(std::vector<int> &audioCaps);
-  void  GetAudioInfo( CStdString& strAudioInfo);
+  void  GetAudioInfo(std::string& strAudioInfo);
   int   GetAudioStream();
   int   GetAudioStreamCount();
   void  GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info);
@@ -95,13 +95,13 @@ public:
   float GetCachePercentage() const;
   int   GetChapterCount();
   int   GetChapter();  
-  void  GetChapterName(CStdString& strChapterName);
+  void  GetChapterName(std::string& strChapterName);
   void  GetDeinterlaceMethods(std::vector<int> &deinterlaceMethods);
   void  GetDeinterlaceModes(std::vector<int> &deinterlaceModes);
-  void  GetGeneralInfo( CStdString& strVideoInfo);
+  void  GetGeneralInfo(std::string& strVideoInfo);
   float GetPercentage() const;
-  CStdString GetPlayerState();
-  CStdString GetPlayingTitle();
+  std::string GetPlayerState();
+  std::string GetPlayingTitle();
   void  GetRenderFeatures(std::vector<int> &renderFeatures);
   void  GetScalingMethods(std::vector<int> &scalingMethods);
   bool  GetStreamDetails(CStreamDetails &details);
@@ -113,7 +113,7 @@ public:
   TextCacheStruct_t* GetTeletextCache();
   int64_t GetTime() const;
   int64_t GetTotalTime() const;
-  void  GetVideoInfo( CStdString& strVideoInfo);
+  void  GetVideoInfo(std::string& strVideoInfo);
   void  GetVideoStreamInfo(SPlayerVideoStreamInfo &info);
   bool  HasAudio() const;
   bool  HasMenu() const;
@@ -143,7 +143,7 @@ public:
   void  SetAVDelay(float fValue = 0.0f);
   void  SetDynamicRangeCompression(long drc);
   void  SetMute(bool bOnOff);
-  bool  SetPlayerState(CStdString state);
+  bool  SetPlayerState(const std::string& state);
   void  SetSubtitle(int iStream);
   void  SetSubTitleDelay(float fValue = 0.0f);
   void  SetSubtitleVisible(bool bVisible);

diff --git a/xbmc/cores/DummyVideoPlayer.cpp b/xbmc/cores/DummyVideoPlayer.cpp
index 0d7cfc6..7e27399 100644 (file)
--- a/xbmc/cores/DummyVideoPlayer.cpp
+++ b/xbmc/cores/DummyVideoPlayer.cpp
@@ -170,17 +170,17 @@ void CDummyVideoPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
   }
 }
 
-void CDummyVideoPlayer::GetAudioInfo(CStdString& strAudioInfo)
+void CDummyVideoPlayer::GetAudioInfo(std::string& strAudioInfo)
 {
   strAudioInfo = "DummyVideoPlayer - nothing to see here";
 }
 
-void CDummyVideoPlayer::GetVideoInfo(CStdString& strVideoInfo)
+void CDummyVideoPlayer::GetVideoInfo(std::string& strVideoInfo)
 {
   strVideoInfo = "DummyVideoPlayer - nothing to see here";
 }
 
-void CDummyVideoPlayer::GetGeneralInfo(CStdString& strGeneralInfo)
+void CDummyVideoPlayer::GetGeneralInfo(std::string& strGeneralInfo)
 {
   strGeneralInfo = "DummyVideoPlayer - what are you still looking for?";
 }
@@ -255,12 +255,12 @@ void CDummyVideoPlayer::ShowOSD(bool bOnoff)
 {
 }
 
-CStdString CDummyVideoPlayer::GetPlayerState()
+std::string CDummyVideoPlayer::GetPlayerState()
 {
   return "";
 }
 
-bool CDummyVideoPlayer::SetPlayerState(CStdString state)
+bool CDummyVideoPlayer::SetPlayerState(const std::string& state)
 {
   return true;
 }
@@ -290,7 +290,7 @@ void CDummyVideoPlayer::Render()
     int mins = (int)(m_clock / 60000);
     int secs = (int)((m_clock / 1000) % 60);
     int ms = (int)(m_clock % 1000);
-    CStdString currentTime = StringUtils::Format("Video goes here %02i:%02i:%03i", mins, secs, ms);
+    std::string currentTime = StringUtils::Format("Video goes here %02i:%02i:%03i", mins, secs, ms);
     float posX = (vw.x1 + vw.x2) * 0.5f;
     float posY = (vw.y1 + vw.y2) * 0.5f;
     CGUITextLayout::DrawText(font, posX, posY, 0xffffffff, 0, currentTime, XBFONT_CENTER_X | XBFONT_CENTER_Y);

diff --git a/xbmc/cores/DummyVideoPlayer.h b/xbmc/cores/DummyVideoPlayer.h
index f02d440..85cb90e 100644 (file)
--- a/xbmc/cores/DummyVideoPlayer.h
+++ b/xbmc/cores/DummyVideoPlayer.h
@@ -50,9 +50,9 @@ public:
   virtual void SetBrightness(bool bPlus) {}
   virtual void SetHue(bool bPlus) {}
   virtual void SetSaturation(bool bPlus) {}
-  virtual void GetAudioInfo(CStdString& strAudioInfo);
-  virtual void GetVideoInfo(CStdString& strVideoInfo);
-  virtual void GetGeneralInfo( CStdString& strVideoInfo);
+  virtual void GetAudioInfo(std::string& strAudioInfo);
+  virtual void GetVideoInfo(std::string& strVideoInfo);
+  virtual void GetGeneralInfo( std::string& strVideoInfo);
   virtual void Update(bool bPauseDrawing)                       {}
   virtual void SwitchToNextAudioLanguage();
   virtual bool CanRecord() { return false; }
@@ -72,8 +72,8 @@ public:
   virtual void ShowOSD(bool bOnoff);
   virtual void DoAudioWork()                                    {}
   
-  virtual CStdString GetPlayerState();
-  virtual bool SetPlayerState(CStdString state);
+  virtual std::string GetPlayerState();
+  virtual bool SetPlayerState(const std::string& state);
   
 private:
   virtual void Process();

diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
index 5390bd1..3667a57 100644 (file)
--- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -143,25 +143,24 @@ bool CExternalPlayer::IsPlaying() const
 
 void CExternalPlayer::Process()
 {
-  CStdString mainFile = m_launchFilename;
-  CStdString archiveContent = "";
+  std::string mainFile = m_launchFilename;
+  std::string archiveContent;
 
   if (m_args.find("{0}") == std::string::npos)
   {
     // Unwind archive names
     CURL url(m_launchFilename);
-    CStdString protocol = url.GetProtocol();
-    if (protocol == "zip" || protocol == "rar"/* || protocol == "iso9660" ??*/ || protocol == "udf")
+    if (url.IsProtocol("zip") || url.IsProtocol("rar") /* || url.IsProtocol("iso9660") ??*/ || url.IsProtocol("udf"))
     {
       mainFile = url.GetHostName();
       archiveContent = url.GetFileName();
     }
-    if (protocol == "musicdb")
+    if (url.IsProtocol("musicdb"))
       mainFile = CMusicDatabaseFile::TranslateUrl(url);
-    if (protocol == "bluray")
+    if (url.IsProtocol("bluray"))
     {
       CURL base(url.GetHostName());
-      if(base.GetProtocol() == "udf")
+      if (base.IsProtocol("udf"))
       {
         mainFile = base.GetHostName(); /* image file */
         archiveContent = base.GetFileName();
@@ -181,7 +180,7 @@ void CExternalPlayer::Process()
       if (vecSplit.size() != 4)
         continue;
 
-      CStdString strMatch = vecSplit[0];
+      std::string strMatch = vecSplit[0];
       StringUtils::Replace(strMatch, ",,",",");
       bool bCaseless = vecSplit[3].find('i') != std::string::npos;
       CRegExp regExp(bCaseless, CRegExp::autoUtf8);
@@ -194,7 +193,7 @@ void CExternalPlayer::Process()
 
       if (regExp.RegFind(mainFile) > -1)
       {
-        CStdString strPat = vecSplit[1];
+        std::string strPat = vecSplit[1];
         StringUtils::Replace(strPat, ",,",",");
 
         if (!regExp.RegComp(strPat.c_str()))
@@ -203,7 +202,7 @@ void CExternalPlayer::Process()
           continue;
         }
 
-        CStdString strRep = vecSplit[2];
+        std::string strRep = vecSplit[2];
         StringUtils::Replace(strRep, ",,",",");
         bool bGlobal = vecSplit[3].find('g') != std::string::npos;
         bool bStop = vecSplit[3].find('s') != std::string::npos;
@@ -228,8 +227,8 @@ void CExternalPlayer::Process()
   CLog::Log(LOGNOTICE, "%s: Start", __FUNCTION__);
 
   // make sure we surround the arguments with quotes where necessary
-  CStdString strFName;
-  CStdString strFArgs;
+  std::string strFName;
+  std::string strFArgs;
 #if defined(TARGET_WINDOWS)
   // W32 batch-file handline
   if (StringUtils::EndsWith(m_filename, ".bat") || StringUtils::EndsWith(m_filename, ".cmd"))
@@ -414,7 +413,7 @@ BOOL CExternalPlayer::ExecuteAppW32(const char* strPath, const char* strSwitches
   si.dwFlags = STARTF_USESHOWWINDOW;
   si.wShowWindow = m_hideconsole ? SW_HIDE : SW_SHOW;
 
-  CStdStringW WstrPath, WstrSwitches;
+  std::wstring WstrPath, WstrSwitches;
   g_charsetConverter.utf8ToW(strPath, WstrPath);
   g_charsetConverter.utf8ToW(strSwitches, WstrSwitches);
 
@@ -538,17 +537,17 @@ void CExternalPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
 {
 }
 
-void CExternalPlayer::GetAudioInfo(CStdString& strAudioInfo)
+void CExternalPlayer::GetAudioInfo(std::string& strAudioInfo)
 {
   strAudioInfo = "CExternalPlayer:GetAudioInfo";
 }
 
-void CExternalPlayer::GetVideoInfo(CStdString& strVideoInfo)
+void CExternalPlayer::GetVideoInfo(std::string& strVideoInfo)
 {
   strVideoInfo = "CExternalPlayer:GetVideoInfo";
 }
 
-void CExternalPlayer::GetGeneralInfo(CStdString& strGeneralInfo)
+void CExternalPlayer::GetGeneralInfo(std::string& strGeneralInfo)
 {
   strGeneralInfo = "CExternalPlayer:GetGeneralInfo";
 }
@@ -621,12 +620,12 @@ void CExternalPlayer::ShowOSD(bool bOnoff)
 {
 }
 
-CStdString CExternalPlayer::GetPlayerState()
+std::string CExternalPlayer::GetPlayerState()
 {
   return "";
 }
 
-bool CExternalPlayer::SetPlayerState(CStdString state)
+bool CExternalPlayer::SetPlayerState(const std::string& state)
 {
   return true;
 }
@@ -640,7 +639,7 @@ bool CExternalPlayer::Initialize(TiXmlElement* pConfig)
   }
   else
   {
-    CStdString xml;
+    std::string xml;
     xml<<*pConfig;
     CLog::Log(LOGERROR, "ExternalPlayer Error: filename element missing from: %s", xml.c_str());
     return false;
@@ -662,7 +661,7 @@ bool CExternalPlayer::Initialize(TiXmlElement* pConfig)
   if (XMLUtils::GetBoolean(pConfig, "hidecursor", bHideCursor) && bHideCursor)
     m_warpcursor = WARP_BOTTOM_RIGHT;
 
-  CStdString warpCursor;
+  std::string warpCursor;
   if (XMLUtils::GetString(pConfig, "warpcursor", warpCursor) && !warpCursor.empty())
   {
     if (warpCursor == "bottomright") m_warpcursor = WARP_BOTTOM_RIGHT;
@@ -732,9 +731,9 @@ void CExternalPlayer::GetCustomRegexpReplacers(TiXmlElement *pRootElement,
       bool bGlobal = szGlobal && stricmp(szGlobal, "true") == 0;
       bool bStop = szStop && stricmp(szStop, "true") == 0;
 
-      CStdString strMatch;
-      CStdString strPat;
-      CStdString strRep;
+      std::string strMatch;
+      std::string strPat;
+      std::string strRep;
       XMLUtils::GetString(pReplacer,"match",strMatch);
       XMLUtils::GetString(pReplacer,"pat",strPat);
       XMLUtils::GetString(pReplacer,"rep",strRep);
@@ -749,7 +748,7 @@ void CExternalPlayer::GetCustomRegexpReplacers(TiXmlElement *pRootElement,
         StringUtils::Replace(strPat, ",",",,");
         StringUtils::Replace(strRep, ",",",,");
 
-        CStdString strReplacer = strMatch + " , " + strPat + " , " + strRep + " , " + (bGlobal ? "g" : "") + (bStop ? "s" : "");
+        std::string strReplacer = strMatch + " , " + strPat + " , " + strRep + " , " + (bGlobal ? "g" : "") + (bStop ? "s" : "");
         if (iAction == 2)
           settings.insert(settings.begin() + i++, 1, strReplacer);
         else

diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.h b/xbmc/cores/ExternalPlayer/ExternalPlayer.h
index aaad767..66f1cbf 100644 (file)
--- a/xbmc/cores/ExternalPlayer/ExternalPlayer.h
+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.h
@@ -22,6 +22,8 @@
 
 #include "cores/IPlayer.h"
 #include "threads/Thread.h"
+#include <string>
+#include <vector>
 
 class CGUIDialogOK;
 
@@ -55,9 +57,9 @@ public:
   virtual void SetBrightness(bool bPlus) {}
   virtual void SetHue(bool bPlus) {}
   virtual void SetSaturation(bool bPlus) {}
-  virtual void GetAudioInfo(CStdString& strAudioInfo);
-  virtual void GetVideoInfo(CStdString& strVideoInfo);
-  virtual void GetGeneralInfo( CStdString& strVideoInfo);
+  virtual void GetAudioInfo(std::string& strAudioInfo);
+  virtual void GetVideoInfo(std::string& strVideoInfo);
+  virtual void GetGeneralInfo(std::string& strVideoInfo);
   virtual void SwitchToNextAudioLanguage();
   virtual bool CanRecord() { return false; }
   virtual bool IsRecording() { return false; }
@@ -75,8 +77,8 @@ public:
   virtual void ShowOSD(bool bOnoff);
   virtual void DoAudioWork()                                    {}
   
-  virtual CStdString GetPlayerState();
-  virtual bool SetPlayerState(CStdString state);
+  virtual std::string GetPlayerState();
+  virtual bool SetPlayerState(const std::string& state);
   
 #if defined(TARGET_WINDOWS)
   virtual BOOL ExecuteAppW32(const char* strPath, const char* strSwitches);
@@ -98,7 +100,7 @@ private:
   int m_speed;
   int m_totalTime;
   int m_time;
-  CStdString m_launchFilename;
+  std::string m_launchFilename;
   HWND m_hwndXbmc; 
 #if defined(TARGET_WINDOWS)
   POINT m_ptCursorpos;
@@ -107,8 +109,8 @@ private:
   CGUIDialogOK* m_dialog;
   int m_xPos;
   int m_yPos;
-  CStdString m_filename;
-  CStdString m_args;
+  std::string m_filename;
+  std::string m_args;
   bool m_hideconsole;
   bool m_hidexbmc;
   bool m_islauncher;

diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index 62cd1be..26489cb 100644 (file)
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -23,8 +23,8 @@
 #include "system.h" // until we get sane int types used here
 #include "IAudioCallback.h"
 #include "IPlayerCallback.h"
-#include "utils/StdString.h"
 #include "guilib/Geometry.h"
+#include <string>
 
 struct TextCacheStruct_t;
 class TiXmlElement;
@@ -50,7 +50,7 @@ public:
   double  starttime; /* start time in seconds */
   double  startpercent; /* start time in percent */  
   bool    identify;  /* identify mode, used for checking format and length of a file */
-  CStdString state;  /* potential playerstate to restore to */
+  std::string state;  /* potential playerstate to restore to */
   bool    fullscreen; /* player is allowed to switch to fullscreen */
   bool    video_only; /* player is not allowed to play audio streams, video streams only */
 };
@@ -151,9 +151,9 @@ public:
   virtual void SetVolume(float volume){}
   virtual bool ControlsVolume(){ return false;}
   virtual void SetDynamicRangeCompression(long drc){}
-  virtual void GetAudioInfo( CStdString& strAudioInfo) = 0;
-  virtual void GetVideoInfo( CStdString& strVideoInfo) = 0;
-  virtual void GetGeneralInfo( CStdString& strVideoInfo) = 0;
+  virtual void GetAudioInfo( std::string& strAudioInfo) = 0;
+  virtual void GetVideoInfo( std::string& strVideoInfo) = 0;
+  virtual void GetGeneralInfo( std::string& strVideoInfo) = 0;
   virtual bool CanRecord() { return false;};
   virtual bool IsRecording() { return false;};
   virtual bool Record(bool bOnOff) { return false;};
@@ -169,7 +169,7 @@ public:
   virtual void SetSubtitle(int iStream){};
   virtual bool GetSubtitleVisible(){ return false;};
   virtual void SetSubtitleVisible(bool bVisible){};
-  virtual int  AddSubtitle(const CStdString& strSubPath) {return -1;};
+  virtual int  AddSubtitle(const std::string& strSubPath) {return -1;};
 
   virtual int  GetAudioStreamCount()  { return 0; }
   virtual int  GetAudioStream()       { return -1; }
@@ -181,7 +181,7 @@ public:
 
   virtual int  GetChapterCount()                               { return 0; }
   virtual int  GetChapter()                                    { return -1; }
-  virtual void GetChapterName(CStdString& strChapterName)      { return; }
+  virtual void GetChapterName(std::string& strChapterName)     { return; }
   virtual int  SeekChapter(int iChapter)                       { return -1; }
 //  virtual bool GetChapterInfo(int chapter, SChapterInfo &info) { return false; }
 
@@ -214,10 +214,10 @@ public:
   virtual bool OnAction(const CAction &action) { return false; };
 
   //returns a state that is needed for resuming from a specific time
-  virtual CStdString GetPlayerState() { return ""; };
-  virtual bool SetPlayerState(CStdString state) { return false;};
+  virtual std::string GetPlayerState() { return ""; };
+  virtual bool SetPlayerState(const std::string& state) { return false;};
   
-  virtual CStdString GetPlayingTitle() { return ""; };
+  virtual std::string GetPlayingTitle() { return ""; };
 
   virtual bool SwitchChannel(const PVR::CPVRChannel &channel) { return false; }
 

diff --git a/xbmc/cores/dvdplayer/DVDMessage.h b/xbmc/cores/dvdplayer/DVDMessage.h
index a7fbe08..a365821 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDMessage.h
+++ b/xbmc/cores/dvdplayer/DVDMessage.h
@@ -203,7 +203,7 @@ private:
 class CDVDMsgPlayerSetState : public CDVDMsg
 {
 public:
-  CDVDMsgPlayerSetState(std::string& state) : CDVDMsg(PLAYER_SET_STATE), m_state(state) {}
+  CDVDMsgPlayerSetState(const std::string& state) : CDVDMsg(PLAYER_SET_STATE), m_state(state) {}
   std::string GetState()                { return m_state; }
 private:
   std::string m_state;

diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 9ba6249..9c7953f 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -2575,7 +2575,7 @@ bool CDVDPlayer::SeekScene(bool bPlus)
   return false;
 }
 
-void CDVDPlayer::GetAudioInfo(CStdString& strAudioInfo)
+void CDVDPlayer::GetAudioInfo(std::string& strAudioInfo)
 {
   { CSingleLock lock(m_StateSection);
     strAudioInfo = StringUtils::Format("D(%s)", m_StateInput.demux_audio.c_str());
@@ -2583,7 +2583,7 @@ void CDVDPlayer::GetAudioInfo(CStdString& strAudioInfo)
   strAudioInfo += StringUtils::Format("\nP(%s)", m_dvdPlayerAudio.GetPlayerInfo().c_str());
 }
 
-void CDVDPlayer::GetVideoInfo(CStdString& strVideoInfo)
+void CDVDPlayer::GetVideoInfo(std::string& strVideoInfo)
 {
   { CSingleLock lock(m_StateSection);
     strVideoInfo = StringUtils::Format("D(%s)", m_StateInput.demux_video.c_str());
@@ -2591,7 +2591,7 @@ void CDVDPlayer::GetVideoInfo(CStdString& strVideoInfo)
   strVideoInfo += StringUtils::Format("\nP(%s)", m_dvdPlayerVideo.GetPlayerInfo().c_str());
 }
 
-void CDVDPlayer::GetGeneralInfo(CStdString& strGeneralInfo)
+void CDVDPlayer::GetGeneralInfo(std::string& strGeneralInfo)
 {
   if (!m_bStop)
   {
@@ -3674,13 +3674,13 @@ bool CDVDPlayer::HasMenu()
     return false;
 }
 
-CStdString CDVDPlayer::GetPlayerState()
+std::string CDVDPlayer::GetPlayerState()
 {
   CSingleLock lock(m_StateSection);
   return m_State.player_state;
 }
 
-bool CDVDPlayer::SetPlayerState(CStdString state)
+bool CDVDPlayer::SetPlayerState(const std::string& state)
 {
   m_messenger.Put(new CDVDMsgPlayerSetState(state));
   return true;
@@ -3698,7 +3698,7 @@ int CDVDPlayer::GetChapter()
   return m_State.chapter;
 }
 
-void CDVDPlayer::GetChapterName(CStdString& strChapterName)
+void CDVDPlayer::GetChapterName(std::string& strChapterName)
 {
   CSingleLock lock(m_StateSection);
   strChapterName = m_State.chapter_name;
@@ -3721,7 +3721,7 @@ int CDVDPlayer::SeekChapter(int iChapter)
   return 0;
 }
 
-int CDVDPlayer::AddSubtitle(const CStdString& strSubPath)
+int CDVDPlayer::AddSubtitle(const std::string& strSubPath)
 {
   return AddSubtitleFile(strSubPath);
 }
@@ -4080,7 +4080,7 @@ bool CDVDPlayer::GetStreamDetails(CStreamDetails &details)
     return false;
 }
 
-CStdString CDVDPlayer::GetPlayingTitle()
+std::string CDVDPlayer::GetPlayingTitle()
 {
   /* Currently we support only Title Name from Teletext line 30 */
   TextCacheStruct_t* ttcache = m_dvdPlayerTeletext.GetTeletextCache();

diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h
index bf73d27..6d80975 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDPlayer.h
+++ b/xbmc/cores/dvdplayer/DVDPlayer.h
@@ -191,9 +191,9 @@ public:
   virtual void UnRegisterAudioCallback()                        { m_dvdPlayerAudio.UnRegisterAudioCallback(); }
   virtual void SetVolume(float nVolume)                         { m_dvdPlayerAudio.SetVolume(nVolume); }
   virtual void SetDynamicRangeCompression(long drc)             { m_dvdPlayerAudio.SetDynamicRangeCompression(drc); }
-  virtual void GetAudioInfo(CStdString& strAudioInfo);
-  virtual void GetVideoInfo(CStdString& strVideoInfo);
-  virtual void GetGeneralInfo( CStdString& strVideoInfo);
+  virtual void GetAudioInfo(std::string& strAudioInfo);
+  virtual void GetVideoInfo(std::string& strVideoInfo);
+  virtual void GetGeneralInfo(std::string& strVideoInfo);
   virtual bool CanRecord();
   virtual bool IsRecording();
   virtual bool CanPause();
@@ -209,7 +209,7 @@ public:
   virtual void SetSubtitle(int iStream);
   virtual bool GetSubtitleVisible();
   virtual void SetSubtitleVisible(bool bVisible);
-  virtual int  AddSubtitle(const CStdString& strSubPath);
+  virtual int  AddSubtitle(const std::string& strSubPath);
 
   virtual int GetAudioStreamCount();
   virtual int GetAudioStream();
@@ -220,7 +220,7 @@ public:
 
   virtual int  GetChapterCount();
   virtual int  GetChapter();
-  virtual void GetChapterName(CStdString& strChapterName);
+  virtual void GetChapterName(std::string& strChapterName);
   virtual int  SeekChapter(int iChapter);
 
   virtual void SeekTime(int64_t iTime);
@@ -235,10 +235,10 @@ public:
   virtual bool GetStreamDetails(CStreamDetails &details);
   virtual void GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info);
 
-  virtual CStdString GetPlayerState();
-  virtual bool SetPlayerState(CStdString state);
+  virtual std::string GetPlayerState();
+  virtual bool SetPlayerState(const std::string& state);
 
-  virtual CStdString GetPlayingTitle();
+  virtual std::string GetPlayingTitle();
 
   virtual bool SwitchChannel(const PVR::CPVRChannel &channel);
   virtual bool CachePVRStream(void) const;

diff --git a/xbmc/cores/omxplayer/OMXPlayer.h b/xbmc/cores/omxplayer/OMXPlayer.h
index 778aa12..6b88aab 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayer.h
+++ b/xbmc/cores/omxplayer/OMXPlayer.h
@@ -189,9 +189,9 @@ public:
   virtual void SetMute(bool bOnOff)                             { m_omxPlayerAudio.SetMute(bOnOff); }
   virtual void SetDynamicRangeCompression(long drc)             { m_omxPlayerAudio.SetDynamicRangeCompression(drc); }
   virtual bool ControlsVolume() {return true;}
-  virtual void GetAudioInfo(CStdString &strAudioInfo);
-  virtual void GetVideoInfo(CStdString &strVideoInfo);
-  virtual void GetGeneralInfo(CStdString &strVideoInfo);
+  virtual void GetAudioInfo(std::string &strAudioInfo);
+  virtual void GetVideoInfo(std::string &strVideoInfo);
+  virtual void GetGeneralInfo(std::string &strVideoInfo);
   virtual bool CanRecord();
   virtual bool IsRecording();
   virtual bool CanPause();
@@ -207,7 +207,7 @@ public:
   virtual void  SetSubtitle(int iStream);
   virtual bool  GetSubtitleVisible();
   virtual void  SetSubtitleVisible(bool bVisible);
-  virtual int   AddSubtitle(const CStdString& strSubPath);
+  virtual int   AddSubtitle(const std::string& strSubPath);
 
   virtual int   GetAudioStreamCount();
   virtual int   GetAudioStream();
@@ -218,7 +218,7 @@ public:
 
   virtual int   GetChapterCount();
   virtual int   GetChapter();
-  virtual void  GetChapterName(CStdString& strChapterName);
+  virtual void  GetChapterName(std::string& strChapterName);
   virtual int   SeekChapter(int iChapter);
 
   virtual void SeekTime(int64_t iTime);
@@ -233,10 +233,10 @@ public:
   virtual bool GetStreamDetails(CStreamDetails &details);
   virtual void GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info);
 
-  virtual CStdString GetPlayerState();
-  virtual bool SetPlayerState(CStdString state);
+  virtual std::string GetPlayerState();
+  virtual bool SetPlayerState(std::string state);
   
-  virtual CStdString GetPlayingTitle();
+  virtual std::string GetPlayingTitle();
 
   virtual bool SwitchChannel(const PVR::CPVRChannel &channel);
   virtual bool CachePVRStream(void) const;

diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
index 386ddd3..3802173 100644 (file)
--- a/xbmc/cores/paplayer/PAPlayer.cpp
+++ b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -87,7 +87,7 @@ PAPlayer::~PAPlayer()
   delete m_FileItem;
 }
 
-bool PAPlayer::HandlesType(const CStdString &type)
+bool PAPlayer::HandlesType(const std::string &type)
 {
   ICodec* codec = CodecFactory::CreateCodec(type);
   if (codec && codec->CanInit())

diff --git a/xbmc/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h
index dd67ca0..82412a3 100644 (file)
--- a/xbmc/cores/paplayer/PAPlayer.h
+++ b/xbmc/cores/paplayer/PAPlayer.h
@@ -58,9 +58,9 @@ public:
   virtual float GetPercentage();
   virtual void SetVolume(float volume);
   virtual void SetDynamicRangeCompression(long drc);
-  virtual void GetAudioInfo( CStdString& strAudioInfo) {}
-  virtual void GetVideoInfo( CStdString& strVideoInfo) {}
-  virtual void GetGeneralInfo( CStdString& strVideoInfo) {}
+  virtual void GetAudioInfo( std::string& strAudioInfo) {}
+  virtual void GetVideoInfo( std::string& strVideoInfo) {}
+  virtual void GetGeneralInfo( std::string& strVideoInfo) {}
   virtual void ToFFRW(int iSpeed = 0);
   virtual int GetCacheLevel() const;
   virtual int64_t GetTotalTime();
@@ -70,7 +70,7 @@ public:
   virtual bool SkipNext();
   virtual void GetAudioCapabilities(std::vector<int> &audioCaps) {}
 
-  static bool HandlesType(const CStdString &type);
+  static bool HandlesType(const std::string &type);
 
   virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job);
 

diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp
index e7fbf81..992a258 100644 (file)
--- a/xbmc/network/upnp/UPnPPlayer.cpp
+++ b/xbmc/network/upnp/UPnPPlayer.cpp
@@ -591,7 +591,7 @@ failed:
   return 0;
 };
 
-CStdString CUPnPPlayer::GetPlayingTitle()
+std::string CUPnPPlayer::GetPlayingTitle()
 {
   return "";
 };

diff --git a/xbmc/network/upnp/UPnPPlayer.h b/xbmc/network/upnp/UPnPPlayer.h
index 777dc33..7e20b86 100644 (file)
--- a/xbmc/network/upnp/UPnPPlayer.h
+++ b/xbmc/network/upnp/UPnPPlayer.h
@@ -51,16 +51,16 @@ public:
   virtual void SeekPercentage(float fPercent = 0);
   virtual float GetPercentage();
   virtual void SetVolume(float volume);
-  virtual void GetAudioInfo( CStdString& strAudioInfo) {};
-  virtual void GetVideoInfo( CStdString& strVideoInfo) {};
-  virtual void GetGeneralInfo( CStdString& strVideoInfo) {};
+  virtual void GetAudioInfo(std::string& strAudioInfo) {};
+  virtual void GetVideoInfo(std::string& strVideoInfo) {};
+  virtual void GetGeneralInfo(std::string& strVideoInfo) {};
   virtual bool CanRecord() { return false;};
   virtual bool IsRecording() { return false;};
   virtual bool Record(bool bOnOff) { return false;};
 
   virtual int  GetChapterCount()                               { return 0; }
   virtual int  GetChapter()                                    { return -1; }
-  virtual void GetChapterName(CStdString& strChapterName)      { return; }
+  virtual void GetChapterName(std::string& strChapterName)     { return; }
   virtual int  SeekChapter(int iChapter)                       { return -1; }
 
   virtual void SeekTime(__int64 iTime = 0);
@@ -74,15 +74,15 @@ public:
   virtual void DoAudioWork();
   virtual bool OnAction(const CAction &action);
 
-  virtual CStdString GetPlayingTitle();
+  virtual std::string GetPlayingTitle();
 
   int PlayFile(const CFileItem& file, const CPlayerOptions& options, CGUIDialogBusy*& dialog, XbmcThreads::EndTime& timeout);
 
 private:
   PLT_MediaController*   m_control;
   CUPnPPlayerController* m_delegate;
-  CStdString             m_current_uri;
-  CStdString             m_current_meta;
+  std::string            m_current_uri;
+  std::string            m_current_meta;
   bool                   m_started;
   bool                   m_stopremote;
 };