add snapshot saving

Author: mikerr

Makefile

@@ -1,12 +1,12 @@
 CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -Wno-psabi -O2
 
-LIBS=-lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lavahi-common -lavahi-client -lfreetype -lmpg123 -lfaad -la52 -Llibs/ilclient -Llibs/vgfont
+LIBS=-lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lavahi-common -lavahi-client -lfreetype -lmpg123 -lfaad -la52 -Llibs/ilclient -Llibs/vgfont 
 
 # The following can be overridden with a command argument (e.g. with building in OpenELEC)
 LDFLAGS=-L/opt/vc/lib
 INCLUDES=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/usr/include/freetype2 -I/usr/include/arm-linux-gnueabi -I/usr/local/include
 
-OBJS=vcodec_mpeg2.o vcodec_omx.o sha1.o htsp.o vo_pi.o codec.o audioplay.o acodec_mpeg.o acodec_aac.o acodec_a52.o channels.o events.o avahi.o osd.o tiresias_pcfont.o avl.o omx_utils.o
+OBJS=vcodec_mpeg2.o vcodec_omx.o sha1.o htsp.o vo_pi.o codec.o audioplay.o acodec_mpeg.o acodec_aac.o acodec_a52.o channels.o events.o avahi.o osd.o snapshot.o tiresias_pcfont.o avl.o omx_utils.o
 
 TARGETS=pidvbip flvtoh264
 
@@ -30,6 +30,8 @@ mpeg2test: mpeg2test.c vo_pi.o libmpeg2/libmpeg2.a
 pidvbip: pidvbip.c libmpeg2/libmpeg2.a libs/vgfont/libvgfont.a libs/ilclient/libilclient.a $(OBJS)
 	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) -o pidvbip pidvbip.c $(OBJS) libmpeg2/libmpeg2.a libs/ilclient/libilclient.a libs/vgfont/libvgfont.a $(LIBS)
 
+snapshot.o: snapshot.c snapshot.h
+	$(CC) $(INCLUDES) $(CFLAGS) -c -o snapshot.o snapshot.c
 vo_pi.o: vo_pi.c vo_pi.h
 	$(CC) $(INCLUDES) $(CFLAGS) -c -o vo_pi.o vo_pi.c
 

pidvbip.c

@@ -46,6 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "osd.h"
 #include "avahi.h"
 #include "cec.h"
+#include "snapshot.h"
 
 struct codecs_t {
   struct codec_t vcodec; // Video
@@ -360,16 +361,14 @@ int read_config(char* configfile,struct htsp_t *htsp)
 
   if (read != -1) {
   	htsp->host = malloc(1024);
-  	int res = sscanf(line,"%s %d",htsp->host,&htsp->port);
-        fprintf(stderr,"read %s %d",htsp->host,htsp->port);
+  	sscanf(line,"%s %d",htsp->host,&htsp->port);
   }
 
   read = getline(&line, &len, fp);
   if (read != -1) {
   	htsp->user = malloc(1024);
   	htsp->password = malloc(1024);
-  	int res = sscanf(line,"%s %s",htsp->user,htsp->password);
-        fprintf(stderr,"read %s %s",htsp->user,htsp->password);
+  	sscanf(line,"%s %s",htsp->user,htsp->password);
   }
   fclose(fp);
   return 0;
@@ -800,6 +799,8 @@ int main(int argc, char* argv[])
             htsp_send_skip(&htsp,30);     // +30 seconds
             break;
 
+	  case 's':
+	    save_snapshot();
             break;
 
           default: