servicedvb: m_record was refcounted, urgs.
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 20 Jan 2006 00:31:04 +0000 (00:31 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 20 Jan 2006 00:31:04 +0000 (00:31 +0000)
lib/service/servicedvb.cpp

index f91d512be6e4e629aa57bfd14e74b4684645c831..61221ecb7ac39de62cd687a376175a67363612be 100644 (file)
@@ -1007,7 +1007,7 @@ RESULT eDVBServicePlay::startTimeshift()
        
        if (m_timeshift_fd < 0)
        {
        
        if (m_timeshift_fd < 0)
        {
-               delete m_record;
+               m_record = 0;
                return -4;
        }
                
                return -4;
        }
                
@@ -1031,12 +1031,11 @@ RESULT eDVBServicePlay::stopTimeshift()
        m_timeshift_enabled = 0;
        
        m_record->stop();
        m_timeshift_enabled = 0;
        
        m_record->stop();
-       delete m_record;
+       m_record = 0;
        
        close(m_timeshift_fd);
        remove(m_timeshift_file.c_str());
        
        
        close(m_timeshift_fd);
        remove(m_timeshift_file.c_str());
        
-       eDebug("timeshift disabled");
        return 0;
 }
 
        return 0;
 }
 
@@ -1109,7 +1108,6 @@ void eDVBServicePlay::updateTimeshiftPids()
 
 void eDVBServicePlay::switchToLive()
 {
 
 void eDVBServicePlay::switchToLive()
 {
-       eDebug("SwitchToLive");
        if (!m_timeshift_active)
                return;
        
        if (!m_timeshift_active)
                return;
        
@@ -1126,7 +1124,6 @@ void eDVBServicePlay::switchToLive()
 
 void eDVBServicePlay::switchToTimeshift()
 {
 
 void eDVBServicePlay::switchToTimeshift()
 {
-       eDebug("SwitchToTimeshift");
        if (m_timeshift_active)
                return;
        
        if (m_timeshift_active)
                return;
        
@@ -1140,7 +1137,6 @@ void eDVBServicePlay::switchToTimeshift()
        eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference;
        r.path = m_timeshift_file;
        
        eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference;
        r.path = m_timeshift_file;
        
-       eDebug("ok, re-tuning to %s", r.toString().c_str());
        m_service_handler_timeshift.tune(r, 1); /* use the decoder demux for everything */
 }
 
        m_service_handler_timeshift.tune(r, 1); /* use the decoder demux for everything */
 }