# HG changeset patch
# User ben
# Date 1154377958 0
# Node ID 6fae24d401384af6d1fba2bf5abe706653c825eb
# Parent  625c00dfd809388c30b114ddd4a4644a3d3c96e2
removed deprecated test.c file from libmpdemux

diff -r 625c00dfd809 -r 6fae24d40138 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Mon Jul 31 20:07:21 2006 +0000
+++ b/libmpdemux/Makefile	Mon Jul 31 20:32:38 2006 +0000
@@ -123,24 +123,16 @@
 	$(AR) r $(LIBNAME) $(OBJS)
 	$(RANLIB) $(LIBNAME)
 
-test:	$(LIBNAME) test.c
-	$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
-	  ./libmpdemux.a ../stream/stream.a \
-	  ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
-	  ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
-	  ../m_option.o ../subreader.o \
-	  $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
-
 clean:
 	rm -f *.o *.a *~
 
 distclean: clean
-	rm -f .depend test
+	rm -f .depend
 
 dep:    depend
 
 depend:
-	$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
 # include dependency files if they exist
diff -r 625c00dfd809 -r 6fae24d40138 libmpdemux/test.c
--- a/libmpdemux/test.c	Mon Jul 31 20:07:21 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-#include "mp_msg.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-//--------------------------
-
-// audio stream skip/resync functions requires only for seeking.
-// (they should be implemented in the audio codec layer)
-void skip_audio_frame(sh_audio_t *sh_audio){
-}
-void resync_audio_stream(sh_audio_t *sh_audio){
-}
-
-int mp_input_check_interrupt(int time){
-    if(time) usleep(time);
-    return 0;
-}
-
-// for libmpdvdkit2:
-#include "get_path.c"
-
-int verbose=5; // must be global!
-
-int stream_cache_size=0;
-
-// for demux_ogg:
-void* vo_sub=NULL;
-int vo_osd_changed(int new_value){return 0;}
-int   subcc_enabled=0;
-
-float sub_fps=0;
-int sub_utf8=0;
-int   suboverlap_enabled = 1;
-float sub_delay=0;
-
-//---------------
-
-extern stream_t* open_stream(char* filename,int vcd_track,int* file_format);
-
-int main(int argc,char* argv[]){
-
-stream_t* stream=NULL;
-demuxer_t* demuxer=NULL;
-int file_format=DEMUXER_TYPE_UNKNOWN;
-
-  mp_msg_init(verbose+MSGL_STATUS);
-
-  if(argc>1)
-    stream=open_stream(argv[1],0,&file_format);
-  else
-//  stream=open_stream("/3d/divx/405divx_sm_v2[1].avi",0,&file_format);
-    stream=open_stream("/dev/cdrom",2,&file_format); // VCD track 2
-
-  if(!stream){
-	printf("Cannot open file/device\n");
-	exit(1);
-  }
-
-  printf("success: format: %d  data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
-
-  if(stream_cache_size)
-      stream_enable_cache(stream,stream_cache_size,0,0);
-
-  demuxer=demux_open(stream,file_format,-1,-1,-1,NULL);
-  if(!demuxer){
-	printf("Cannot open demuxer\n");
-	exit(1);
-  }
-
-  if(demuxer->video->sh)
-      video_read_properties(demuxer->video->sh);
-
-  return 0;
-}
diff -r 625c00dfd809 -r 6fae24d40138 stream/Makefile
--- a/stream/Makefile	Mon Jul 31 20:07:21 2006 +0000
+++ b/stream/Makefile	Mon Jul 31 20:32:38 2006 +0000
@@ -136,12 +136,12 @@
 	freesdp/*.o freesdp/*.a freesdp/*~
 
 distclean: clean
-	rm -f .depend test
+	rm -f .depend
 
 dep:    depend
 
 depend:
-	$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
 # include dependency files if they exist