1 files changed, 60 insertions, 5 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 3f2eea6..aa37cd7 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -4,2 +4,4 @@
 //#include <qpe/qpeapplication.h>
+#include <qimage.h>
+#include <qpe/resource.h>
 
@@ -7,2 +9,5 @@
 
+#include <qgfx_qws.h>
+#include <qdirectpainter_qws.h>
+
 #include "xinevideowidget.h"
@@ -11,2 +16,4 @@
 
+typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
+                                      int  width, int height,int bytes );
 
@@ -20,3 +27,6 @@ extern "C" {
     void null_set_scaling( vo_driver_t* self, int scale );
-
+    void null_set_gui_width( vo_driver_t* self, int width );
+    void null_set_gui_height( vo_driver_t* self, int height );
+    void null_set_mode( vo_driver_t* self, int depth,  int rgb  );
+    void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data);
 }
@@ -25,3 +35,5 @@ using namespace XINE;
 
-Lib::Lib(XineVideoWidget* /*widget*/) {
+Lib::Lib(XineVideoWidget* widget) {
+    m_video = false;
+    m_wid = widget;
     printf("Lib");
@@ -42,5 +54,6 @@ Lib::Lib(XineVideoWidget* /*widget*/) {
     // test code
-    m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
+/*    m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
                                                   VISUAL_TYPE_FB,
                                                   0 );
+*/
 
@@ -50,3 +63,3 @@ Lib::Lib(XineVideoWidget* /*widget*/) {
     while ( ( out = files[i] ) != 0 ) {
-        printf("Audio %s\n", out );
+        printf("Video %s\n", out );
         i++;
@@ -58,2 +71,18 @@ Lib::Lib(XineVideoWidget* /*widget*/) {
     m_videoOutput = ::init_video_out_plugin( m_config, NULL );
+    if (m_wid != 0 ) {
+        printf("!0\n" );
+        ::null_set_gui_width( m_videoOutput,  m_wid->image()->width() );
+        ::null_set_gui_height(m_videoOutput,  m_wid->image()->height() );
+        ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
+        m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8;
+        QImage image = Resource::loadImage("SoundPlayer");
+        image = image.smoothScale( m_wid->width(), m_wid->height() );
+        QImage* img = new QImage( image );
+        m_wid->setImage( img );
+        m_wid->repaint();
+    }
+    null_display_handler( m_videoOutput,
+                          xine_display_frame,
+                          this );
+
     m_xine = xine_init( m_videoOutput,
@@ -91,3 +120,6 @@ int Lib::play( const QString& fileName,
                int start_time ) {
-    QString str = fileName;
+    QString str = fileName.stripWhiteSpace();
+    //workaround OpiePlayer bug
+    if (str.right(1) == QString::fromLatin1("/") )
+        str = str.mid( str.length() -1 );
     return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),
@@ -134,2 +166,3 @@ void Lib::handleXineEvent( xine_event_t* t ) {
 void Lib::setShowVideo( bool video ) {
+    m_video = video;
     ::null_set_show_video( m_videoOutput,  video );
@@ -154 +187,23 @@ void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
 }
+void Lib::xine_display_frame( void* user_data, uint8_t *frame,
+                              int width,  int height,  int bytes ) {
+    printf("display x frame");
+    ((Lib*)user_data)->drawFrame( frame,  width, height,  bytes );
+    printf("displayed x frame\n");
+}
+void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
+    if (!m_video ) {
+        qWarning("not showing video now");
+        return;
+    }
+    qWarning("called draw frame %d %d",  width,  height);
+
+    QSize size = m_wid->size();
+    int xoffset  = (size.width() - width) / 2;
+    int yoffset  = (size.height() - height) / 2;
+    int linestep = qt_screen->linestep();
+
+    m_wid->setImage( frame, yoffset, xoffset, width, height, linestep, bytes, m_bytes_per_pixel );
+    m_wid->repaint();
+
+}