Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index eb57b67..00c534a 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -72,12 +72,7 @@ Lib::Lib(XineVideoWidget* widget) { 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() ); + resize ( m_wid-> size ( )); ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); - m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8; - QImage image = Resource::loadImage(""); - image = image.smoothScale( m_wid->width(), m_wid->height() ); - QImage* img = new QImage( image ); - m_wid->setImage( img ); + m_wid-> setImage ( new QImage ( Resource::loadImage(""))); m_wid->repaint(); } @@ -101,4 +96,12 @@ Lib::~Lib() { } +void Lib::resize ( const QSize &s ) +{ + if ( s. width ( ) && s. height ( )) { + ::null_set_gui_width( m_videoOutput, s. width() ); + ::null_set_gui_height(m_videoOutput, s. height() ); + } +} + QCString Lib::version() { QCString str( xine_get_str_version() ); @@ -188,7 +191,6 @@ 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 ) { @@ -199,10 +201,5 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { // 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->setImage( frame, width, height, bytes ); // m_wid->repaint(false); |