display mux, service name and provider name in the PVR stream

information OSD

diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index 7ffc77c..a6397fe 100644 (file)
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -595,7 +595,7 @@
                                <description>BER value</description>
                                <left>220</left>
                                <top>165</top>
-                               <width>1000</width>
+                               <width>165</width>
                                <height>25</height>
                                <label>$INFO[PVR.ActStreamBER]</label>
                                <align>left</align>
@@ -605,7 +605,7 @@
                        </control>
                        <control type="label">
                                <description>UNC</description>
-                               <left>430</left>
+                               <left>390</left>
                                <top>165</top>
                                <width>165</width>
                                <height>25</height>
@@ -617,9 +617,9 @@
                        </control>
                        <control type="label">
                                <description>UNC value</description>
-                               <left>600</left>
+                               <left>560</left>
                                <top>165</top>
-                               <width>1000</width>
+                               <width>165</width>
                                <height>25</height>
                                <label>$INFO[PVR.ActStreamUNC]</label>
                                <align>left</align>
@@ -628,6 +628,30 @@
                                <textcolor>white</textcolor>
                        </control>
                        <control type="label">
+                               <description>Service</description>
+                               <left>730</left>
+                               <top>165</top>
+                               <width>165</width>
+                               <height>25</height>
+                               <label>$LOCALIZE[19099]:</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>grey2</textcolor>
+                       </control>
+                       <control type="label">
+                               <description>Service value</description>
+                               <left>900</left>
+                               <top>165</top>
+                               <width>330</width>
+                               <height>25</height>
+                               <label>$INFO[PVR.ActStreamServiceName]</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>white</textcolor>
+                       </control>
+                       <control type="label">
                                <description>Encryption</description>
                                <left>50</left>
                                <top>190</top>
@@ -643,7 +667,7 @@
                                <description>Encryption value</description>
                                <left>220</left>
                                <top>190</top>
-                               <width>1000</width>
+                               <width>165</width>
                                <height>25</height>
                                <label>$INFO[PVR.ActStreamEncryptionName]</label>
                                <align>left</align>
@@ -651,6 +675,54 @@
                                <font>font12</font>
                                <textcolor>white</textcolor>
                        </control>
+                       <control type="label">
+                               <description>Provider</description>
+                               <left>390</left>
+                               <top>190</top>
+                               <width>165</width>
+                               <height>25</height>
+                               <label>$LOCALIZE[19101]:</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>grey2</textcolor>
+                       </control>
+                       <control type="label">
+                               <description>Provider value</description>
+                               <left>560</left>
+                               <top>190</top>
+                               <width>165</width>
+                               <height>25</height>
+                               <label>$INFO[PVR.ActStreamProviderName]</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>white</textcolor>
+                       </control>
+                       <control type="label">
+                               <description>Mux</description>
+                               <left>730</left>
+                               <top>190</top>
+                               <width>165</width>
+                               <height>25</height>
+                               <label>$LOCALIZE[19100]:</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>grey2</textcolor>
+                       </control>
+                       <control type="label">
+                               <description>Mux value</description>
+                               <left>900</left>
+                               <top>190</top>
+                               <width>330</width>
+                               <height>25</height>
+                               <label>$INFO[PVR.ActStreamMux]</label>
+                               <align>left</align>
+                               <aligny>center</aligny>
+                               <font>font12</font>
+                               <textcolor>white</textcolor>
+                       </control>
                </control>
        </controls>
 </window>

diff --git a/language/English/strings.po b/language/English/strings.po
index 5096061..cb38cc3 100755 (executable)
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -7558,7 +7558,20 @@ msgctxt "#19098"
 msgid "Warning"
 msgstr ""
 
-#empty strings from id 19099 to 19101
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19099"
+msgid "Service"
+msgstr ""
+
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19100"
+msgid "Mux"
+msgstr ""
+
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19101"
+msgid "Provider"
+msgstr ""
 
 msgctxt "#19102"
 msgid "Please switch to another channel."

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 49985a4..d69c231 100644 (file)
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -665,7 +665,10 @@ const infomap pvr[] =            {{ "isrecording",              PVR_IS_RECORDING
                                   { "actstreamprogrsignal",     PVR_ACTUAL_STREAM_SIG_PROGR },
                                   { "actstreamprogrsnr",        PVR_ACTUAL_STREAM_SNR_PROGR },
                                   { "actstreamisencrypted",     PVR_ACTUAL_STREAM_ENCRYPTED },
-                                  { "actstreamencryptionname",  PVR_ACTUAL_STREAM_CRYPTION }};
+                                  { "actstreamencryptionname",  PVR_ACTUAL_STREAM_CRYPTION },
+                                  { "actstreamservicename",     PVR_ACTUAL_STREAM_SERVICE },
+                                  { "actstreammux",             PVR_ACTUAL_STREAM_MUX },
+                                  { "actstreamprovidername",    PVR_ACTUAL_STREAM_PROVIDER }};
 
 const infomap slideshow[] =      {{ "ispaused",         SLIDESHOW_ISPAUSED },
                                   { "isactive",         SLIDESHOW_ISACTIVE },
@@ -1375,6 +1378,9 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa
   case PVR_ACTUAL_STREAM_AUDIO_BR:
   case PVR_ACTUAL_STREAM_DOLBY_BR:
   case PVR_ACTUAL_STREAM_CRYPTION:
+  case PVR_ACTUAL_STREAM_SERVICE:
+  case PVR_ACTUAL_STREAM_MUX:
+  case PVR_ACTUAL_STREAM_PROVIDER:
     g_PVRManager.TranslateCharInfo(info, strLabel);
     break;
   case WEATHER_CONDITIONS:

diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index 1d70720..8a9d629 100644 (file)
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -477,7 +477,10 @@ namespace INFO
 #define PVR_ACTUAL_STREAM_AUDIO_BR  (PVR_STRINGS_START + 31)
 #define PVR_ACTUAL_STREAM_DOLBY_BR  (PVR_STRINGS_START + 32)
 #define PVR_ACTUAL_STREAM_CRYPTION  (PVR_STRINGS_START + 33)
-#define PVR_STRINGS_END             PVR_ACTUAL_STREAM_CRYPTION
+#define PVR_ACTUAL_STREAM_SERVICE   (PVR_STRINGS_START + 34)
+#define PVR_ACTUAL_STREAM_MUX       (PVR_STRINGS_START + 35)
+#define PVR_ACTUAL_STREAM_PROVIDER  (PVR_STRINGS_START + 36)
+#define PVR_STRINGS_END             PVR_ACTUAL_STREAM_PROVIDER
 
 #define WINDOW_PROPERTY             9993
 #define WINDOW_IS_TOPMOST           9994

diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
index 36ef0aa..40a8384 100644 (file)
--- a/xbmc/addons/include/xbmc_pvr_types.h
+++ b/xbmc/addons/include/xbmc_pvr_types.h
@@ -194,6 +194,9 @@ extern "C" {
   {
     char   strAdapterName[PVR_ADDON_NAME_STRING_LENGTH];   /*!< @brief (optional) name of the adapter that's being used */
     char   strAdapterStatus[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) status of the adapter that's being used */
+    char   strServiceName[PVR_ADDON_NAME_STRING_LENGTH];   /*!< @brief (optional) name of the current service */
+    char   strProviderName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (optional) name of the current service's provider */
+    char   strMuxName[PVR_ADDON_NAME_STRING_LENGTH];       /*!< @brief (optional) name of the current mux */
     int    iSNR;                                           /*!< @brief (optional) signal/noise ratio */
     int    iSignal;                                        /*!< @brief (optional) signal strength */
     long   iBER;                                           /*!< @brief (optional) bit error rate */

diff --git a/xbmc/pvr/PVRGUIInfo.cpp b/xbmc/pvr/PVRGUIInfo.cpp
index f0ed5a0..d9b1861 100644 (file)
--- a/xbmc/pvr/PVRGUIInfo.cpp
+++ b/xbmc/pvr/PVRGUIInfo.cpp
@@ -342,6 +342,15 @@ bool CPVRGUIInfo::TranslateCharInfo(DWORD dwInfo, CStdString &strValue) const
   case PVR_ACTUAL_STREAM_CRYPTION:
     CharInfoEncryption(strValue);
     break;
+  case PVR_ACTUAL_STREAM_SERVICE:
+    CharInfoService(strValue);
+    break;
+  case PVR_ACTUAL_STREAM_MUX:
+    CharInfoMux(strValue);
+    break;
+  case PVR_ACTUAL_STREAM_PROVIDER:
+    CharInfoProvider(strValue);
+    break;
   case PVR_BACKEND_NAME:
     CharInfoBackendName(strValue);
     break;
@@ -620,6 +629,30 @@ void CPVRGUIInfo::CharInfoEncryption(CStdString &strValue) const
     strValue = StringUtils::EmptyString;
 }
 
+void CPVRGUIInfo::CharInfoService(CStdString &strValue) const
+{
+  if (!strcmp(m_qualityInfo.strServiceName, StringUtils::EmptyString))
+    strValue.Format("%s", g_localizeStrings.Get(13205));
+  else
+    strValue.Format("%s", m_qualityInfo.strServiceName);
+}
+
+void CPVRGUIInfo::CharInfoMux(CStdString &strValue) const
+{
+  if (!strcmp(m_qualityInfo.strMuxName, StringUtils::EmptyString))
+    strValue.Format("%s", g_localizeStrings.Get(13205));
+  else
+    strValue.Format("%s", m_qualityInfo.strMuxName);
+}
+
+void CPVRGUIInfo::CharInfoProvider(CStdString &strValue) const
+{
+  if (!strcmp(m_qualityInfo.strProviderName, StringUtils::EmptyString))
+    strValue.Format("%s", g_localizeStrings.Get(13205));
+  else
+    strValue.Format("%s", m_qualityInfo.strProviderName);
+}
+
 void CPVRGUIInfo::UpdateBackendCache(void)
 {
   CStdString strBackendName;

diff --git a/xbmc/pvr/PVRGUIInfo.h b/xbmc/pvr/PVRGUIInfo.h
index 2967084..34bc258 100644 (file)
--- a/xbmc/pvr/PVRGUIInfo.h
+++ b/xbmc/pvr/PVRGUIInfo.h
@@ -125,6 +125,9 @@ namespace PVR
     void CharInfoBackendRecordings(CStdString &strValue) const;
     void CharInfoPlayingClientName(CStdString &strValue) const;
     void CharInfoEncryption(CStdString &strValue) const;
+    void CharInfoService(CStdString &strValue) const;
+    void CharInfoMux(CStdString &strValue) const;
+    void CharInfoProvider(CStdString &strValue) const;
 
     /** @name GUIInfoManager data */
     //@{