Merge branch 'obi/bcm_accel'

[enigma2.git] / lib / service / servicexine.cpp

diff --git a/lib/service/servicexine.cpp b/lib/service/servicexine.cpp
index b2ef7f7ffbdb19d4450830443ba04a862d17ed88..6b9adfb9d1caa98eefcd6881fb25ad88581dd8c8 100644 (file)
--- a/lib/service/servicexine.cpp
+++ b/lib/service/servicexine.cpp
@@ -106,7 +106,8 @@ eServiceXine::eServiceXine(const char *filename): m_filename(filename), m_pump(e
        vo_port = 0;
        
        
        vo_port = 0;
        
        

-       if ((vo_port = xine_open_video_driver(xine, "fb", XINE_VISUAL_TYPE_FB, NULL)) == NULL)
+//     if ((vo_port = xine_open_video_driver(xine, "fb", XINE_VISUAL_TYPE_FB, NULL)) == NULL)
+       if ((vo_port = xine_open_video_driver(xine, "none", XINE_VISUAL_TYPE_NONE, NULL)) == NULL)

        {
                eWarning("cannot open xine video driver");
        }
        {
                eWarning("cannot open xine video driver");
        }


@@ -128,16 +129,22 @@ eServiceXine::~eServiceXine()
        if (m_state == stRunning)
                stop();
 
        if (m_state == stRunning)
                stop();
 

+       eDebug("close stream");

        if (stream)
                xine_close(stream);
        if (stream)
                xine_close(stream);

+       eDebug("dispose queue");

        if (event_queue)
                xine_event_dispose_queue(event_queue);
        if (event_queue)
                xine_event_dispose_queue(event_queue);

+       eDebug("dispose stream");

        if (stream)
                xine_dispose(stream);
        if (stream)
                xine_dispose(stream);

+       eDebug("dispose ao_port");

        if (ao_port)
        if (ao_port)

-               xine_close_audio_driver(xine, ao_port); 
+               xine_close_audio_driver(xine, ao_port);
+       eDebug("dispose vo port");

        if (vo_port)
                xine_close_video_driver(xine, vo_port); 
        if (vo_port)
                xine_close_video_driver(xine, vo_port); 

+       eDebug("done.");

 }
 
 DEFINE_REF(eServiceXine);      
 }
 
 DEFINE_REF(eServiceXine);      


@@ -168,8 +175,8 @@ RESULT eServiceXine::start()
        if (m_state == stError)
                return -1;
 
        if (m_state == stError)
                return -1;
 

-       assert(m_state == stIdle);
-       assert(stream);
+       ASSERT(m_state == stIdle);
+       ASSERT(stream);

        
        if (!xine_open(stream, m_filename.c_str()))
        {
        
        if (!xine_open(stream, m_filename.c_str()))
        {


@@ -194,8 +201,8 @@ RESULT eServiceXine::stop()
        if (m_state == stError)
                return -1;
 
        if (m_state == stError)
                return -1;
 

-       assert(m_state != stIdle);
-       assert(stream);
+       ASSERT(m_state != stIdle);
+       ASSERT(stream);

        if (m_state == stStopped)
                return -1;
        printf("Xine: %s stop\n", m_filename.c_str());
        if (m_state == stStopped)
                return -1;
        printf("Xine: %s stop\n", m_filename.c_str());


@@ -229,12 +236,13 @@ RESULT eServiceXine::setFastForward(int ratio)
                // iPausableService
 RESULT eServiceXine::pause()
 {
                // iPausableService
 RESULT eServiceXine::pause()
 {

-       // PAUSE
+       //SPEED_PAUSE

        return 0;
 }
 
 RESULT eServiceXine::unpause()
 {
        return 0;
 }
 
 RESULT eServiceXine::unpause()
 {

+       //SPEED_NORMAL

        // PLAY
        return 0;
 }
        // PLAY
        return 0;
 }


@@ -248,7 +256,23 @@ RESULT eServiceXine::seek(ePtr<iSeekableService> &ptr)
 
 RESULT eServiceXine::getLength(pts_t &pts)
 {
 
 RESULT eServiceXine::getLength(pts_t &pts)
 {

-               // LENGTH
+       pts = -1;
+       if (m_state == stError)
+               return 1;
+       ASSERT(stream);
+       
+       int pos_stream, pos_time, length_time;
+       
+       if (!xine_get_pos_length(stream, &pos_stream, &pos_time, &length_time))
+       {
+               eDebug("xine_get_pos_length failed!");
+               return 1;
+       }
+       
+       eDebug("length: %d ms", length_time);
+       
+       pts = length_time * 90;
+       

        return 0;
 }
 
        return 0;
 }
 


@@ -266,6 +290,19 @@ RESULT eServiceXine::seekRelative(int direction, pts_t to)
 
 RESULT eServiceXine::getPlayPosition(pts_t &pts)
 {
 
 RESULT eServiceXine::getPlayPosition(pts_t &pts)
 {

+       pts = -1;
+       if (m_state == stError)
+               return 1;
+       ASSERT(stream);
+       
+       int pos_stream, pos_time, length_time;
+       
+       if (!xine_get_pos_length(stream, &pos_stream, &pos_time, &length_time))
+               return 1;
+       
+       eDebug("pos_time: %d", pos_time);
+       pts = pos_time * 90;
+       

                // GET POSITION
        return 0;
 }
                // GET POSITION
        return 0;
 }


@@ -278,7 +315,7 @@ RESULT eServiceXine::setTrickmode(int trick)
 
 RESULT eServiceXine::isCurrentlySeekable()
 {
 
 RESULT eServiceXine::isCurrentlySeekable()
 {

-       return 1;
+       return 3;

 }
 
 RESULT eServiceXine::info(ePtr<iServiceInformation>&i)
 }
 
 RESULT eServiceXine::info(ePtr<iServiceInformation>&i)