Merge pull request #108 from Dima73/translation
authorlittlesat <littlesat99@yahoo.com>
Thu, 3 Dec 2015 22:42:14 +0000 (23:42 +0100)
committerlittlesat <littlesat99@yahoo.com>
Thu, 3 Dec 2015 22:42:14 +0000 (23:42 +0100)
add "header" for Title with translation

data/skin_default/icons/Makefile.am
lib/dvb/pmt.cpp
lib/service/servicedvb.cpp

index 71d0709..742b1fe 100644 (file)
@@ -17,6 +17,7 @@ dist_install_DATA = \
        faz.png \
        folder.png \
        fza.png \
+       hdd.png \
        ico_mp_forward.png \
        ico_mp_pause.png \
        ico_mp_play.png \
index 98fc9a5..6fa15ed 100644 (file)
@@ -710,7 +710,7 @@ int eDVBServicePMTHandler::getDecodeDemux(ePtr<iDVBDemux> &demux)
        int ret=0;
                /* if we're using the decoding demux as data source
                   (for example in pvr playbacks), return that one. */
-       if (m_use_decode_demux)
+       if (m_pvr_channel)
        {
                demux = m_demux;
                return ret;
index 321436d..3123fb5 100644 (file)
@@ -2000,9 +2000,9 @@ std::string eDVBServicePlay::getInfoString(int w)
        case sLiveStreamDemuxId:
        {
                eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
-               std::string demux;
-               demux += h.getDemuxID() + '0';
-               return demux;
+               std::stringstream demux;
+               demux << h.getDemuxID();
+               return demux.str();
        }
        default:
                break;