Merge branch 'bug_124_m2ts_support'

[enigma2.git] / lib / nav / core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 90650f68262d012cf1fc8e23bebe7a1784c10572..ad777660f5d3dc04d969a5468ecdf1e5da56e479 100644 (file)
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -26,7 +26,7 @@ RESULT eNavigation::playService(const eServiceReference &service)
 {
        stopService();
        
 {
        stopService();
        

-       assert(m_servicehandler);
+       ASSERT(m_servicehandler);

        RESULT res = m_servicehandler->play(service, m_runningService);
        if (m_runningService)
        {
        RESULT res = m_servicehandler->play(service, m_runningService);
        if (m_runningService)
        {


@@ -74,7 +74,7 @@ RESULT eNavigation::stopService(void)
 
 RESULT eNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate)
 {
 
 RESULT eNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate)
 {

-       assert(m_servicehandler);
+       ASSERT(m_servicehandler);

        RESULT res = m_servicehandler->record(ref, service);
        eDebug("record: %d", res);
        if (res)
        RESULT res = m_servicehandler->record(ref, service);
        eDebug("record: %d", res);
        if (res)


@@ -148,7 +148,7 @@ RESULT eNavigation::pause(int dop)
 
 eNavigation::eNavigation(iServiceHandler *serviceHandler)
 {
 
 eNavigation::eNavigation(iServiceHandler *serviceHandler)
 {

-       assert(serviceHandler);
+       ASSERT(serviceHandler);

        m_servicehandler = serviceHandler;
 }
 
        m_servicehandler = serviceHandler;
 }