Merge remote branch 'origin/bug_306_sort_by_date'

[enigma2.git] / lib / python / Plugins / Extensions / DVDPlayer / src / servicedvd.cpp

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index cdb01d3cab74394c7182f55e958980dfb0e4322b..0372c49719edaf6d223af83fc119e32525535095 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -51,7 +51,7 @@ DEFINE_REF(eServiceFactoryDVD)
 RESULT eServiceFactoryDVD::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
 {
                // check resources...
 RESULT eServiceFactoryDVD::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
 {
                // check resources...

-       ptr = new eServiceDVD(ref.path.c_str());
+       ptr = new eServiceDVD(ref);

        return 0;
 }
 
        return 0;
 }
 


@@ -84,37 +84,75 @@ RESULT eServiceFactoryDVD::offlineOperations(const eServiceReference &, ePtr<iSe
 
 DEFINE_REF(eServiceDVD);
 
 
 DEFINE_REF(eServiceDVD);
 

-eServiceDVD::eServiceDVD(const char *filename):
-       m_filename(filename),
+eServiceDVD::eServiceDVD(eServiceReference ref):
+       m_ref(ref),

        m_ddvdconfig(ddvd_create()),
        m_ddvdconfig(ddvd_create()),

-       m_pixmap(new gPixmap(eSize(720, 576), 32)),

        m_subtitle_widget(0),
        m_state(stIdle),
        m_current_trick(0),
        m_subtitle_widget(0),
        m_state(stIdle),
        m_current_trick(0),

-       m_sn(eApp, ddvd_get_messagepipe_fd(m_ddvdconfig), eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup),

        m_pump(eApp, 1)
 {
        m_pump(eApp, 1)
 {

-       std::string aspect;
+       int aspect = DDVD_16_9;
+       int policy = DDVD_PAN_SCAN;
+       int policy2 = DDVD_PAN_SCAN;
+
+       char tmp[255];
+       ssize_t rd;
+
+       m_sn = eSocketNotifier::create(eApp, ddvd_get_messagepipe_fd(m_ddvdconfig), eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup);

        eDebug("SERVICEDVD construct!");
        // create handle
        eDebug("SERVICEDVD construct!");
        // create handle

-       ddvd_set_dvd_path(m_ddvdconfig, filename);
+       ddvd_set_dvd_path(m_ddvdconfig, ref.path.c_str());

        ddvd_set_ac3thru(m_ddvdconfig, 0);
        ddvd_set_ac3thru(m_ddvdconfig, 0);

-       ddvd_set_language(m_ddvdconfig, "de");
-
-       if (ePythonConfigQuery::getConfigValue("config.av.aspect", aspect) != 0)
-               aspect = "16_9";
-       if (aspect == "4_3_letterbox")
-               ddvd_set_video(m_ddvdconfig, DDVD_4_3_LETTERBOX, DDVD_PAL);
-       else if (aspect == "4_3_panscan")
-               ddvd_set_video(m_ddvdconfig, DDVD_4_3_PAN_SCAN, DDVD_PAL);
-       else
-               ddvd_set_video(m_ddvdconfig, DDVD_16_9, DDVD_PAL);

 
 

-       ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, 720, 576, 4, 720*4);
-       CONNECT(m_sn.activated, eServiceDVD::gotMessage);
+       std::string ddvd_language;
+       if (!ePythonConfigQuery::getConfigValue("config.osd.language", ddvd_language))
+               ddvd_set_language(m_ddvdconfig, (ddvd_language.substr(0,2)).c_str());
+
+       int fd = open("/proc/stb/video/aspect", O_RDONLY);
+       if (fd > -1)
+       {
+               rd = read(fd, tmp, 255);
+               if (rd > 2 && !strncmp(tmp, "4:3", 3))
+                       aspect = DDVD_4_3;
+               else if (rd > 4 && !strncmp(tmp, "16:10", 5))
+                       aspect = DDVD_16_10;
+               close(fd);
+       }
+
+       fd = open("/proc/stb/video/policy", O_RDONLY);
+       if (fd > -1)
+       {
+               rd = read(fd, tmp, 255);
+               if (rd > 6 && !strncmp(tmp, "bestfit", 7))
+                       policy = DDVD_JUSTSCALE;
+               else if (rd > 8 && !strncmp(tmp, "letterbox", 9))
+                       policy = DDVD_LETTERBOX;
+               close(fd);
+       }
+
+#ifdef DDVD_SUPPORTS_16_10_SCALING
+       fd = open("/proc/stb/video/policy2", O_RDONLY);
+       if (fd > -1)
+       {
+               rd = read(fd, tmp, 255);
+               if (rd > 6 && !strncmp(tmp, "bestfit", 7))
+                       policy2 = DDVD_JUSTSCALE;
+               else if (rd > 8 && !strncmp(tmp, "letterbox", 9))
+                       policy2 = DDVD_LETTERBOX;
+               close(fd);
+       }
+       ddvd_set_video_ex(m_ddvdconfig, aspect, policy, policy2, DDVD_PAL /*unused*/);
+#else
+       ddvd_set_video(m_ddvdconfig, aspect, policy, DDVD_PAL /*unused*/);
+#warning please update libdreamdvd for 16:10 scaling support!
+#endif
+
+       CONNECT(m_sn->activated, eServiceDVD::gotMessage);

        CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage);
        strcpy(m_ddvd_titlestring,"");
        m_cue_pts = 0;
        CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage);
        strcpy(m_ddvd_titlestring,"");
        m_cue_pts = 0;

+       pause();

 }
 
 void eServiceDVD::gotThreadMessage(const int &msg)
 }
 
 void eServiceDVD::gotThreadMessage(const int &msg)


@@ -157,8 +195,24 @@ void eServiceDVD::gotMessage(int /*what*/)
                }
                case DDVD_SCREEN_UPDATE:
                        eDebug("DVD_SCREEN_UPDATE!");
                }
                case DDVD_SCREEN_UPDATE:
                        eDebug("DVD_SCREEN_UPDATE!");

-                       if (m_subtitle_widget)
-                               m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576));
+                       if (m_subtitle_widget) {
+                               int x1,x2,y1,y2;
+                               ddvd_get_last_blit_area(m_ddvdconfig, &x1, &x2, &y1, &y2);
+                               
+                               int x_offset = 0, y_offset = 0, width = 720, height = 576;
+
+#ifdef DDVD_SUPPORTS_GET_BLIT_DESTINATION
+                               ddvd_get_blit_destination(m_ddvdconfig, &x_offset, &y_offset, &width, &height);
+                               eDebug("values got from ddvd: %d %d %d %d", x_offset, y_offset, width, height);
+                               y_offset = -y_offset;
+                               width -= x_offset * 2;
+                               height -= y_offset * 2;
+#endif
+                               eRect dest(x_offset, y_offset, width, height);
+
+                               if (dest.width() && dest.height())
+                                       m_subtitle_widget->setPixmap(m_pixmap, eRect(x1, y1, (x2-x1)+1, (y2-y1)+1), dest);
+                       }

                        break;
                case DDVD_SHOWOSD_STATE_PLAY:
                {
                        break;
                case DDVD_SHOWOSD_STATE_PLAY:
                {


@@ -212,6 +266,14 @@ void eServiceDVD::gotMessage(int /*what*/)
                        eDebug("DVD_SOF_REACHED!");
                        m_event(this, evSOF);
                        break;
                        eDebug("DVD_SOF_REACHED!");
                        m_event(this, evSOF);
                        break;

+               case DDVD_SHOWOSD_ANGLE:
+               {
+                       int current, num;
+                       ddvd_get_angle_info(m_ddvdconfig, &current, &num);
+                       eDebug("DVD_ANGLE_INFO: %d / %d", current, num);
+                       m_event(this, evUser+13);
+                       break;
+               }

                case DDVD_SHOWOSD_TIME:
                {
                        static struct ddvd_time last_info;
                case DDVD_SHOWOSD_TIME:
                {
                        static struct ddvd_time last_info;


@@ -230,6 +292,8 @@ void eServiceDVD::gotMessage(int /*what*/)
                        ddvd_get_title_string(m_ddvdconfig, m_ddvd_titlestring);
                        eDebug("DDVD_SHOWOSD_TITLESTRING: %s",m_ddvd_titlestring);
                        loadCuesheet();
                        ddvd_get_title_string(m_ddvdconfig, m_ddvd_titlestring);
                        eDebug("DDVD_SHOWOSD_TITLESTRING: %s",m_ddvd_titlestring);
                        loadCuesheet();

+                       if (!m_cue_pts)
+                               unpause();

                        m_event(this, evStart);
                        break;
                }
                        m_event(this, evStart);
                        break;
                }


@@ -256,6 +320,7 @@ eServiceDVD::~eServiceDVD()
        kill();
        saveCuesheet();
        ddvd_close(m_ddvdconfig);
        kill();
        saveCuesheet();
        ddvd_close(m_ddvdconfig);

+       disableSubtitles(0);

 }
 
 RESULT eServiceDVD::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 }
 
 RESULT eServiceDVD::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)


@@ -266,20 +331,19 @@ RESULT eServiceDVD::connectEvent(const Slot2<void,iPlayableService*,int> &event,
 
 RESULT eServiceDVD::start()
 {
 
 RESULT eServiceDVD::start()
 {

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

        m_state = stRunning;
        eDebug("eServiceDVD starting");
        m_state = stRunning;
        eDebug("eServiceDVD starting");

-       run();

 //     m_event(this, evStart);
        return 0;
 }
 
 RESULT eServiceDVD::stop()
 {
 //     m_event(this, evStart);
        return 0;
 }
 
 RESULT eServiceDVD::stop()
 {

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

        if (m_state == stStopped)
                return -1;
        if (m_state == stStopped)
                return -1;

-       eDebug("DVD: stop %s", m_filename.c_str());
+       eDebug("DVD: stop %s", m_ref.path.c_str());

        m_state = stStopped;
        ddvd_send_key(m_ddvdconfig, DDVD_KEY_EXIT);
 
        m_state = stStopped;
        ddvd_send_key(m_ddvdconfig, DDVD_KEY_EXIT);
 


@@ -393,7 +457,7 @@ RESULT eServiceDVD::getName(std::string &name)
        if ( m_ddvd_titlestring[0] != '\0' )
                name = m_ddvd_titlestring;
        else
        if ( m_ddvd_titlestring[0] != '\0' )
                name = m_ddvd_titlestring;
        else

-               name = m_filename;
+               name = m_ref.path;

        return 0;
 }
 
        return 0;
 }
 


@@ -434,6 +498,7 @@ int eServiceDVD::getInfo(int w)
                }
                case sUser+6:
                case sUser+7:
                }
                case sUser+6:
                case sUser+7:

+               case sUser+8:

                        return resIsPyObject;
                default:
                        return resNA;
                        return resIsPyObject;
                default:
                        return resNA;


@@ -445,7 +510,7 @@ std::string eServiceDVD::getInfoString(int w)
        switch(w)
        {
                case sServiceref:
        switch(w)
        {
                case sServiceref:

-                       break;
+                       return m_ref.toString();

                default:
                        eDebug("unhandled getInfoString(%d)", w);
        }
                default:
                        eDebug("unhandled getInfoString(%d)", w);
        }


@@ -503,6 +568,16 @@ PyObject *eServiceDVD::getInfoObject(int w)
                        }                               
                        return tuple;
                }
                        }                               
                        return tuple;
                }

+               case sUser+8:
+               {
+                       ePyObject tuple = PyTuple_New(2);
+                       int current, num;
+                       ddvd_get_angle_info(m_ddvdconfig, &current, &num);
+                       PyTuple_SetItem(tuple, 0, PyInt_FromLong(current));
+                       PyTuple_SetItem(tuple, 1, PyInt_FromLong(num));
+
+                       return tuple;
+               }

                default:
                        eDebug("unhandled getInfoObject(%d)", w);
        }
                default:
                        eDebug("unhandled getInfoObject(%d)", w);
        }


@@ -511,13 +586,28 @@ PyObject *eServiceDVD::getInfoObject(int w)
 
 RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*entry*/)
 {
 
 RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*entry*/)
 {

-       if (m_subtitle_widget)
-               delete m_subtitle_widget;
+       delete m_subtitle_widget;
+

        m_subtitle_widget = new eSubtitleWidget(parent);
        m_subtitle_widget->resize(parent->size());
        m_subtitle_widget = new eSubtitleWidget(parent);
        m_subtitle_widget->resize(parent->size());

-       m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576));
+
+       eSize size = eSize(720, 576);
+
+       if (!m_pixmap)
+       {
+               m_pixmap = new gPixmap(size, 32, 1); /* allocate accel surface (if possible) */
+#ifdef DDVD_SUPPORTS_GET_BLIT_DESTINATION
+               ddvd_set_lfb_ex(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4, 1);
+#else
+               ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4);
+#warning please update libdreamdvd for fast scaling
+#endif
+               run(); // start the thread
+       }
+

        m_subtitle_widget->setZPosition(-1);
        m_subtitle_widget->show();
        m_subtitle_widget->setZPosition(-1);
        m_subtitle_widget->show();

+

        return 0;
 }
 
        return 0;
 }
 


@@ -606,7 +696,7 @@ RESULT eServiceDVD::setTrickmode(int /*trick*/)
 
 RESULT eServiceDVD::isCurrentlySeekable()
 {
 
 RESULT eServiceDVD::isCurrentlySeekable()
 {

-       return m_state == stRunning;
+       return m_state == stRunning ? 3 : 0;

 }
 
 RESULT eServiceDVD::keyPressed(int key)
 }
 
 RESULT eServiceDVD::keyPressed(int key)


@@ -652,6 +742,9 @@ RESULT eServiceDVD::keyPressed(int key)
        case iServiceKeys::keyUser+7:
                ddvd_send_key(m_ddvdconfig, DDVD_KEY_MENU);
                break;
        case iServiceKeys::keyUser+7:
                ddvd_send_key(m_ddvdconfig, DDVD_KEY_MENU);
                break;

+       case iServiceKeys::keyUser+8:
+               ddvd_send_key(m_ddvdconfig, DDVD_KEY_ANGLE);
+               break;

        default:
                return -1;
        }
        default:
                return -1;
        }


@@ -693,7 +786,7 @@ void eServiceDVD::loadCuesheet()
        if ( m_ddvd_titlestring[0] != '\0' )
                snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring);
        else
        if ( m_ddvd_titlestring[0] != '\0' )
                snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring);
        else

-               snprintf(filename, 128, "%s/dvd.cuts", m_filename.c_str());
+               snprintf(filename, 128, "%s/dvd.cuts", m_ref.path.c_str());

 
        eDebug("eServiceDVD::loadCuesheet() filename=%s",filename);
 
 
        eDebug("eServiceDVD::loadCuesheet() filename=%s",filename);
 


@@ -764,7 +857,7 @@ void eServiceDVD::saveCuesheet()
        if ( m_ddvd_titlestring[0] != '\0' )
                snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring);
        else
        if ( m_ddvd_titlestring[0] != '\0' )
                snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring);
        else

-               snprintf(filename, 128, "%s/dvd.cuts", m_filename.c_str());
+               snprintf(filename, 128, "%s/dvd.cuts", m_ref.path.c_str());

        
        FILE *f = fopen(filename, "wb");
 
        
        FILE *f = fopen(filename, "wb");