[vdr] Re: compile error for bitstreamout-0.48

[Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>]

Hi

* Dr. Werner Fink schrieb am 17.12.03, um 11:31 Uhr:
> Try the following patch: ...

I tried this patch, but it was not enough, to make it possible to
build bitstreamout with autopid. I had to edit replay.c a little bit,
to make it buildable. (I don't know, if these changes were right,
because i have a lot of stuttering on some channels.)

Here ist the patch:

--- vdr-plugin-bitstreamout-0.48.orig/bitstreamout-0.48/replay.c
+++ vdr-plugin-bitstreamout-0.48/bitstreamout-0.48/replay.c
@@ -146,7 +146,7 @@
     bool ret = false;				// DVB streams do not have sub stream headers
     cHandle dvd(&b[off], rest);
 
-    test(dvd >= 4) {
+    TEST(dvd >= 4) {
 	uint_32 ul = dvd;
 	uint_8  ub = (uint_8)(ul>>24);
 	uint_8  tr = (ub & 7) + 1;
@@ -185,7 +185,7 @@
 	default:				// Should not happen, e.g. stream
 	    break;				// is broken. Should we reset???
 	}
-    } end (dvd);
+    } END (dvd);
 
     return ret;
 }
@@ -199,7 +199,7 @@
     if (stream)
 	goto out;
 
-    test(dvd >= 4) {
+    TEST(dvd >= 4) {
 	// byte0	(substream number)
 	// byte1	(Number of frames which begin in this package)
 	// byte2, byte3 (offset to frame which corresponds to PTS value)
@@ -294,9 +294,9 @@
 	default:
 	    break;
 	}
-    } end (dvd);
+    } END (dvd);
 
-    test(dvb >= 2) {
+    TEST(dvb >= 2) {
 	uint_16 us = dvb;
 	if (us == AC3magic) {
 	    stream = &ac3;
@@ -305,7 +305,7 @@
 	    stream->track = (uint_8)(us>>8);
 	    clear_setup(AUDIO);
 	}
-    } end (dvd);
+    } END (dvd);
 out:
     return (stream != NULL);
 }
@@ -316,7 +316,7 @@
     const off_t rest = cnt-off;
     cHandle audio(&b[off], rest);
 
-    foreach(audio >= 2) {
+    FOREACH(audio >= 2) {
 	uint_16 us = audio;
 	bool ext   = ((us & 0x0100)>>8 == 0);
 	bool lsf   = ((us & 0x0080)>>7 == 0);
@@ -361,7 +361,7 @@
 	off += o;
 	break;
 
-    } end (handle);
+    } END (handle);
 
     return (stream != NULL);
 }
@@ -386,7 +386,7 @@
 	goto out;
     }
 
-    test (play >= 10) {
+    TEST (play >= 10) {
 	uint_32 mag = play;
 	play += 4;
 	uint_16 len = (uint_16)play + 6;
@@ -468,7 +468,7 @@
 		skip = 2;
 	}
 
-    } end (play);
+    } END (play);
 out:
     return;
 }



I would like to suggest an other small change in the Makefile, to be
more similiar to the standard-plugin Makefile:


--- vdr-plugin-bitstreamout-0.48.orig/bitstreamout-0.48/Makefile
+++ vdr-plugin-bitstreamout-0.48/bitstreamout-0.48/Makefile
@@ -37,7 +37,7 @@
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/include/vdr/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:



Greetings 
Thomas

-- 
Thomas Schmidt
:wq

Attachment: signature.asc
Description: Digital signature