[vdr] sofdevice cvs unused variables

[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.cvs.orig/Makefile softplay.cvs/Makefile
--- softplay.cvs.orig/Makefile	2006-04-26 00:29:15.000000000 -0700
+++ softplay.cvs/Makefile	2006-04-26 00:59:27.000000000 -0700
@@ -24,7 +24,6 @@
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -35,7 +34,11 @@
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ifeq ($(strip $(APIVERSION)),)
+   APIVERSION = $(VDRVERSION)
+endif
 
 ### The name of the distribution archive:
 
@@ -44,7 +47,7 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil 
+INCLUDES += -I$(VDRDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil 
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -79,7 +82,7 @@
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
-	@cp $@ $(LIBDIR)/[EMAIL PROTECTED](VDRVERSION)
+	@cp $@ $(LIBDIR)/[EMAIL PROTECTED](APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

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