fix the fix

1 files changed, 4 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 877e49a..5224862 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -1,183 +1,183 @@
 
 /*#include <xine.h>*/
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <video_out.h>
-#include <xine_internal.h>
-#include <xineutils.h>
-#include <configfile.h>
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/configfile.h>
 
 typedef struct null_driver_s null_driver_t;
 
 struct null_driver_s {
     vo_driver_t vo_driver;
     uint32_t m_capabilities;
 
 };
 typedef struct opie_frame_s opie_frame_t;
 struct opie_frame_s {
     vo_frame_t frame;
     char* name;
     int version;
     int m_width;
     int m_height;
     uint8_t *chunk[3];
     null_driver_t *output;
 };
 
 static uint32_t null_get_capabilities(vo_driver_t *self ){   
     null_driver_t* this = (null_driver_t*)self;
     printf("capabilities\n");
     return this->m_capabilities;
 }
 
 /* take care of the frame*/
 static void null_frame_dispose( vo_frame_t* vo_img){    
     opie_frame_t* frame = (opie_frame_t*)vo_img;
     printf("frame_dispose\n");
     free (frame);
 }
 static void null_frame_field( vo_frame_t* frame, int inti ){
     printf("frame_field\n");
     /* not needed */
 }
 
 /* end take care of frames*/
 
 static vo_frame_t* null_alloc_frame( vo_driver_t* self ){    
     null_driver_t* this = (null_driver_t*)self;
     opie_frame_t* frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
     memset( frame, 0, sizeof( opie_frame_t) );
     printf("alloc_frame\n");
     frame->name = "opie\0";
     frame->version = 1;
     frame->output = this;
 
     /* initialize the frame*/
     frame->frame.driver = self;
     /*frame.frame.free = null_frame_free;*/
     frame->frame.copy = NULL;
     frame->frame.field = null_frame_field;
     frame->frame.dispose = null_frame_dispose;
  
 
     return (vo_frame_t*) frame;
 }
 static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
 				      uint32_t width, uint32_t height,
 				      int ratio_code, int format, int flags ){
     null_driver_t* this = (null_driver_t*) self;
     opie_frame_t*  frame = (opie_frame_t*)img;
     /* not needed now */
     printf("update_frame_format\n");
     printf("al crash aye?\n");
 
     if(frame->chunk[0] ){
 	free( frame->chunk[0] );
 	frame->chunk[0] = NULL;	
     }
     if(frame->chunk[1] ){
 	free ( frame->chunk[1] );
 	frame->chunk[1] = NULL;
     }	
     if(frame->chunk[2] ){
 	free ( frame->chunk[2] );
 	frame->chunk[2] = NULL;
     }
 
 
     if( format == IMGFMT_YV12 ) {
 	int image_size = width * height; /* cast ouch*/
 	frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
 						       (void **)&frame->chunk[0] );
 	frame->frame.base[1] = xine_xmalloc_aligned(16, image_size,
 						       (void **)&frame->chunk[1] );
 	frame->frame.base[2] = xine_xmalloc_aligned(16, image_size,
 						       (void **)&frame->chunk[2] );
     }else{
 	int image_size = width * height; /* cast ouch*/
 	frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
 						       (void **)&frame->chunk[0] );
 	frame->chunk[1] = NULL;
 	frame->chunk[2] = NULL;
     }
 
 }
 static void null_display_frame( vo_driver_t* self, vo_frame_t *frame ){
     printf("display frame\n");
 }
 static void null_overlay_blend( vo_driver_t* self, vo_frame_t* frame,
 			       vo_overlay_t* overlay ){
     /* sure */
 }
 static int null_get_property( vo_driver_t* self,
 			      int property ){
     printf("property get]n");			     
     return 0;
 }
 static int null_set_property( vo_driver_t* self,
 			      int property,
 			      int value ){
     printf("set property\n");			     
     return value;
 }
 static void null_get_property_min_max( vo_driver_t* self,
 				       int property, int *min,
 				       int *max ){
     printf("min max\n");				       
     *max = 0;
     *min = 0;
 }
 static int null_gui_data_exchange( vo_driver_t* self,
 				   int data_type,
 				   void *data ){
     return 0;
 }
 static void null_exit( vo_driver_t* self ){
     null_driver_t* this = (null_driver_t*)self;
     free ( this );
 }
 static int null_redraw_needed( vo_driver_t* self ){
     return 0;
 }
 				       
 
 vo_driver_t* init_video_out_plugin( config_values_t* conf,
 				    void* video ){
     null_driver_t *vo;
     vo = (null_driver_t*)malloc( sizeof(null_driver_t ) );
     /* memset? */
 
     /* install callback handlers*/
     vo->vo_driver.get_capabilities = null_get_capabilities;
     vo->vo_driver.alloc_frame = null_alloc_frame;
     vo->vo_driver.update_frame_format = null_update_frame_format;
     vo->vo_driver.display_frame = null_display_frame;
     vo->vo_driver.overlay_blend = null_overlay_blend;
     vo->vo_driver.get_property = null_get_property;
     vo->vo_driver.set_property = null_set_property;
     vo->vo_driver.get_property_min_max = null_get_property_min_max;
     vo->vo_driver.gui_data_exchange = null_gui_data_exchange;
     vo->vo_driver.exit = null_exit;
     vo->vo_driver.redraw_needed = null_redraw_needed;
     
 
     /* capabilities */
     vo->m_capabilities = /*VO_CAP_COPIES_IMAGE |*/ VO_CAP_YV12 | VO_CAP_BRIGHTNESS;
     printf("done initialisation\n");
     return (vo_driver_t*) vo;
 }
 
 static vo_info_t vo_info_null = {
     5,
     "null plugin",
     NULL,
     VISUAL_TYPE_FB,
     5
 };
 
 vo_info_t *get_video_out_plugin_info(){
     vo_info_null.description = _("xine video output plugin using null device");
     return &vo_info_null;
 }