dvdplayer: you are dead, dont you come back anymore'

8 files changed, 64 insertions, 64 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 3d6a6e9833..bc7b293fb7 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -14227,277 +14227,277 @@ msgstr ""
 #empty strings from id 29923 to 29925
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29926"
 msgid "Adult hits"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29927"
 msgid "Spanish talk"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29928"
 msgid "Spanish music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29929"
 msgid "Hip hop"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29930"
 msgid "Radio Traffic advisory message!"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29931"
 msgid "Radio message"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29932"
 msgid "Language"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29933"
 msgid "College"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29934"
 msgid "Personality"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29935"
 msgid "Public"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29936"
 msgid "Soft music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29937"
 msgid "Adult hits"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29938"
 msgid "Soft rock"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29939"
 msgid "Talk"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29940"
 msgid "No programme type"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29941"
 msgid "News"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29942"
 msgid "Current affairs"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29943"
 msgid "Information"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29944"
 msgid "Sport"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29945"
 msgid "Education"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29946"
 msgid "Drama"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29947"
 msgid "Culture"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29948"
 msgid "Science"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29949"
 msgid "Varied"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29950"
 msgid "Pop music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29951"
 msgid "Rock music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29952"
 msgid "Easy listening music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29953"
 msgid "Light classical"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29954"
 msgid "Serious classical"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29955"
 msgid "Other music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29956"
 msgid "Weather"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29957"
 msgid "Finance"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29958"
 msgid "Children's Programmes"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29959"
 msgid "Social Affairs"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29960"
 msgid "Religion"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29961"
 msgid "Phone-in"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29962"
 msgid "Travel"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29963"
 msgid "Leisure"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29964"
 msgid "Jazz Music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29965"
 msgid "Country Music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29966"
 msgid "National Music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29967"
 msgid "Oldies Music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29968"
 msgid "Folk Music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29969"
 msgid "Documentary"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29970"
 msgid "Alarm Test"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29971"
 msgid "Alarm"
 msgstr ""
@@ -14505,19 +14505,19 @@ msgstr ""
 #empty strings from id 29972 to 29976
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29977"
 msgid "Classic rock music"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29978"
 msgid "Classical"
 msgstr ""
 
 #. Program style name
-#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
 msgctxt "#29979"
 msgid "Nostalgia"
 msgstr ""
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 2ded595132..00a72e15d9 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -1611,7 +1611,7 @@
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerRadioRDS.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.cpp" />
@@ -2262,7 +2262,7 @@
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerRadioRDS.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 408dc2dd0d..9e4a08a700 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -417,8 +417,8 @@
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.cpp">
       <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerRadioRDS.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.cpp">
       <Filter>cores\VideoPlayer</Filter>
@@ -3281,8 +3281,8 @@
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.h">
       <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerRadioRDS.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.h">
       <Filter>cores\VideoPlayer</Filter>
diff --git a/xbmc/cores/VideoPlayer/Makefile.in b/xbmc/cores/VideoPlayer/Makefile.in
index 99cefc205f..1f454e4d61 100644
--- a/xbmc/cores/VideoPlayer/Makefile.in
+++ b/xbmc/cores/VideoPlayer/Makefile.in
@@ -12,7 +12,7 @@ SRCS += VideoPlayerAudio.cpp
 SRCS += VideoPlayerSubtitle.cpp
 SRCS += VideoPlayerTeletext.cpp
 SRCS += VideoPlayerVideo.cpp
-SRCS += DVDPlayerRadioRDS.cpp
+SRCS += VideoPlayerRadioRDS.cpp
 SRCS += DVDStreamInfo.cpp
 SRCS += DVDTSCorrection.cpp
 SRCS += Edl.cpp
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index dba307dfe1..0fbd0dff23 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "system.h"
-#include "DVDPlayerRadioRDS.h"
+#include "VideoPlayerRadioRDS.h"
 #include "VideoPlayer.h"
 
 #include "DVDInputStreams/DVDInputStream.h"
@@ -583,7 +583,7 @@ CVideoPlayer::CVideoPlayer(IPlayerCallback& callback)
       m_CurrentVideo(STREAM_VIDEO, VideoPlayer_VIDEO),
       m_CurrentSubtitle(STREAM_SUBTITLE, VideoPlayer_SUBTITLE),
       m_CurrentTeletext(STREAM_TELETEXT, VideoPlayer_TELETEXT),
-      m_CurrentRadioRDS(STREAM_RADIO_RDS, DVDPLAYER_RDS),
+      m_CurrentRadioRDS(STREAM_RADIO_RDS, VideoPlayer_RDS),
       m_messenger("player"),
       m_ready(true),
       m_DemuxerPausePending(false)
@@ -3229,7 +3229,7 @@ std::string CVideoPlayer::GetRadioText(unsigned int line)
   if (m_CurrentRadioRDS.id < 0)
       return "";
 
-  return m_dvdPlayerRadioRDS->GetRadioText(line);
+  return m_VideoPlayerRadioRDS->GetRadioText(line);
 }
 
 void CVideoPlayer::SeekTime(int64_t iTime)
@@ -3580,7 +3580,7 @@ bool CVideoPlayer::OpenTeletextStream(CDVDStreamInfo& hint)
 
 bool CVideoPlayer::OpenRadioRDSStream(CDVDStreamInfo& hint)
 {
-  if (!m_dvdPlayerRadioRDS->CheckStream(hint))
+  if (!m_VideoPlayerRadioRDS->CheckStream(hint))
     return false;
 
   if(!OpenStreamPlayer(m_CurrentRadioRDS, hint, true))
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.h b/xbmc/cores/VideoPlayer/VideoPlayer.h
index 02f7832a4b..8cbc72e3e1 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.h
@@ -30,7 +30,7 @@
 #include "VideoPlayerVideo.h"
 #include "VideoPlayerSubtitle.h"
 #include "VideoPlayerTeletext.h"
-#include "DVDPlayerRadioRDS.h"
+#include "VideoPlayerRadioRDS.h"
 #include "Edl.h"
 #include "FileItem.h"
 #include "system.h"
diff --git a/xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
index ca60ffda43..5a2db47e93 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp
@@ -62,7 +62,7 @@
 #include "utils/StringUtils.h"
 #include "utils/log.h"
 
-#include "DVDPlayerRadioRDS.h"
+#include "VideoPlayerRadioRDS.h"
 
 using namespace XFILE;
 using namespace PVR;
@@ -681,7 +681,7 @@ void CDVDRadioRDSData::Flush()
 {
   if(!m_messageQueue.IsInited())
     return;
-  /* flush using message as this get's called from dvdplayer thread */
+  /* flush using message as this get's called from VideoPlayer thread */
   /* and any demux packet that has been taken out of queue need to */
   /* be disposed of before we flush */
   m_messageQueue.Flush();
diff --git a/xbmc/cores/dvdplayer/DVDPlayerRadioRDS.h b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.h
index 42f2610ade..17eba8ca81 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerRadioRDS.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.h
@@ -22,7 +22,7 @@
 
 #include <deque>
 
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 #include "DVDMessageQueue.h"
 #include "FileItem.h"
 #include "threads/Thread.h"