[vdr] sofdevice and softplay cvs cleanups

[C.Y.M]

I have been trying to clean up my builds and when updated softdevice and
softplay via cvs, noticed several warning about unused variables. Also, it
appears that softplay does not have the current Makefile fixes required to build
under the latest VDR.

Best Regards,

--- softdevice.cvs/video-shm.c.orig	2006-09-03 04:34:56.000000000 -0700
+++ softdevice.cvs/video-shm.c	2006-09-03 04:41:00.000000000 -0700
@@ -285,16 +285,16 @@
 };
 
 void cShmVideoOut::YUV(sPicBuffer *buf) {
-        uint8_t *Py=buf->pixel[0]+(buf->edge_height)*buf->stride[0]
-                +buf->edge_width;
-        uint8_t *Pu=buf->pixel[1]+(buf->edge_height/2)*buf->stride[1]
-                +buf->edge_width/2;
-        uint8_t *Pv=buf->pixel[2]+(buf->edge_height/2)*buf->stride[2]
-                +buf->edge_width/2;
-        int Ystride=buf->stride[0];
-        int UVstride=buf->stride[1];
-        int Width=buf->width;
-        int Height=buf->height;
+//        uint8_t *Py=buf->pixel[0]+(buf->edge_height)*buf->stride[0]
+//                +buf->edge_width;
+//        uint8_t *Pu=buf->pixel[1]+(buf->edge_height/2)*buf->stride[1]
+//                +buf->edge_width/2;
+//        uint8_t *Pv=buf->pixel[2]+(buf->edge_height/2)*buf->stride[2]
+//                +buf->edge_width/2;
+//        int Ystride=buf->stride[0];
+//        int UVstride=buf->stride[1];
+//        int Width=buf->width;
+//        int Height=buf->height;
   
         if (!ctl->attached) {
                 setupStore->shouldSuspend=1;
@@ -354,8 +354,8 @@
                 return;
         };
       
-        int width= ctl->max_width < Width ? ctl->max_width : Width;
-        int height= ctl->max_height < Height ? ctl->max_height : Height;    
+//        int width= ctl->max_width < Width ? ctl->max_width : Width;
+//        int height= ctl->max_height < Height ? ctl->max_height : Height;    
         
         ctl->width=fwidth;
         ctl->height=fheight;
--- softdevice.cvs/video-xv.c.orig	2006-09-03 04:35:18.000000000 -0700
+++ softdevice.cvs/video-xv.c	2006-09-03 04:36:34.000000000 -0700
@@ -1814,10 +1814,10 @@
                 +buf->edge_width/2;
   uint8_t *Pv=buf->pixel[2]+(buf->edge_height/2)*buf->stride[2]
                 +buf->edge_width/2;
-  int Ystride=buf->stride[0];
-  int UVstride=buf->stride[1];
-  int Width=buf->width;
-  int Height=buf->height;
+//  int Ystride=buf->stride[0];
+//  int UVstride=buf->stride[1];
+//  int Width=buf->width;
+//  int Height=buf->height;
 
   if ( Py && Pu && Pv ) {
 #if VDRVERSNUM >= 10307

--- softplay.cvs/Makefile.orig	2006-05-19 01:04:59.000000000 -0700
+++ softplay.cvs/Makefile	2006-05-19 01:05:35.000000000 -0700
@@ -90,4 +90,4 @@
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ getFFmpegLibs

diff -ru softplay/Makefile softplay.cvs/Makefile
--- softplay/Makefile.orig	2006-03-20 12:09:20.000000000 -0800
+++ softplay/Makefile	2006-04-01 18:22:00.000000000 -0800
@@ -11,7 +11,7 @@
 
 #LIBFFMPEG=/home/martin/vdr/ffmpeg
 #LIBFFMPEG=/home/martin/vdr/ffmpeg-0.4.9-pre1
-LIBFFMPEG=/usr/local/include/ffmpeg/
+LIBFFMPEG=/usr/include/ffmpeg/
 
 ### The version number of this plugin (taken from the main source file):
 

_______________________________________________
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr