1 files changed, 8 insertions, 9 deletions

diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index f356e76..63d5752 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -71,9 +71,9 @@ struct opie_frame_s {
   
     int bytes_per_line;
     uint8_t *data;
 
-    int show_video;
+//    int show_video;
     null_driver_t *output;
 };
 
 static uint32_t null_get_capabilities(vo_driver_t *self ){   
@@ -84,18 +84,17 @@ static uint32_t null_get_capabilities(vo_driver_t *self ){
 
 static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
   opie_frame_t  *frame = (opie_frame_t *) vo_img ;
   printf("frame copy\n");
-  if(!frame->show_video ){ printf("no video\n"); return; } // no video
+  if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video
 
   if (frame->format == IMGFMT_YV12) {
       frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
                                    src[0], src[1], src[2]);
   } else {
 
       frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
                                     src[0]);
-      
           }
   
   frame->rgb_dst += frame->stripe_inc; 
   printf("returning\n");
@@ -144,9 +143,9 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
     printf("alloc_frame\n");
     frame->name = "opie\0";
     frame->version = 1;
     frame->output = this;
-    frame->show_video = this->m_show_video;
+//    frame->show_video = this->m_show_video;
     /* initialize the frame*/
     frame->frame.driver = self;
     /*frame.frame.free = null_frame_free;*/
     frame->frame.copy = null_frame_copy;
@@ -164,9 +163,9 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
 
 // size specific
 static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
 
-    if (!this->m_is_scaling || !this->m_show_video) {
+    if (!this->m_is_scaling /*|| !this->m_show_video*/) {
         printf("Not scaling\n");
         frame->ideal_width   = frame->width;
         frame->ideal_height  = frame->height;
         frame->ratio_factor  = 1.0;
@@ -300,9 +299,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
         frame->flags      = flags;
         frame->format     = format;
         frame->user_ratio = this->user_ratio;
         this->gui_changed = 0;
-        frame->show_video = this->m_show_video;
+        //frame->show_video = this->m_show_video;
 
         
             null_compute_ideal_size (this, frame);
             null_compute_rgb_size (this, frame);
@@ -354,9 +353,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
   
         /* 
          * set up colorspace converter
          */
-        if(this->m_show_video ){
+        if(1 /*this->m_show_video*/ ){
                     printf("showing video\n");      
 
         switch (flags) {
             case VO_TOP_FIELD:
@@ -413,17 +412,17 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){
     opie_frame_t* frame = (opie_frame_t*)frame_gen;
     display_xine_frame_t display = this->frameDis;
 
     printf("display frame\n");
-            //    if( this->m_show_video ) { // return if not displaying
+        //       if( this->m_show_video ) { // return if not displaying
         printf("calling home aye\n" );
         if( display != NULL ) {
         (*display)(this->caller, frame->data,
                    frame->output_width, frame->output_height,
                    frame->bytes_per_line );
         printf("display done hope you enyoyed the frame");
         }
-        //    }
+//    }
     
     frame->frame.displayed (&frame->frame);
 }