From 4a5af4f4897d6b34e232ed0e22d1fec9b57177b9 Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Wed, 22 Oct 2008 11:17:43 +0000
Subject: [PATCH] - fixed output format of some debug messages (thanks to Rolf
 Ahrenberg)

---
 CONTRIBUTORS          |  1 +
 HISTORY               |  1 +
 server/livestreamer.c | 18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d7c0647..d21e162 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Rolf Ahrenberg
   for making it possible to pass parameters to externremux.sh
   for removing pre VDR 1.4 legacy code
   for adding gettext support
+  for fixing output format of some debug messages
 
 Rantanen Teemu
   for providing vdr-incompletesections.diff
diff --git a/HISTORY b/HISTORY
index b601880..347c367 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- fixed output format of some debug messages (thanks to Rolf Ahrenberg)
 - added HTTP authentication
 - compatibility for VDR 1.7.1 (thanks to Udo Richter)
 - added vdr-1.6.0-intcamdevices.patch (thanks to Anssi Hannula)
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 7ea9268..98bee87 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -77,7 +77,7 @@ public:
 
 cStreamdevPatFilter::cStreamdevPatFilter(cStreamdevLiveStreamer *Streamer, const cChannel *Channel)
 {
-	Dprintf("cStreamdevPatFilter(\"%s\")", Channel->Name());
+	Dprintf("cStreamdevPatFilter(\"%s\")\n", Channel->Name());
 	assert(Streamer);
 	m_Channel = Channel;
 	m_Streamer = Streamer;
@@ -136,7 +136,7 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
 	case 0x10: // ISO/IEC 14496-2 Visual (MPEG-4)
 	case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
 	case 0x1b: // ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264)
-		Dprintf("cStreamdevPatFilter PMT scanner adding PID %d (%s)",
+		Dprintf("cStreamdevPatFilter PMT scanner adding PID %d (%s)\n",
 			stream.getPid(), psStreamTypes[stream.getStreamType()]);
 		return stream.getPid();
 	case 0x05: // ISO/IEC 13818-1 private sections
@@ -144,19 +144,19 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
 		for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
 			switch (d->getDescriptorTag()) {
 			case SI::AC3DescriptorTag:
-				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", 
+				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
 					stream.getPid(), psStreamTypes[stream.getStreamType()], "AC3");
 				return stream.getPid();
 			case SI::TeletextDescriptorTag:
-				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", 
+				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
 					stream.getPid(), psStreamTypes[stream.getStreamType()], "Teletext");
 				return stream.getPid();
 			case SI::SubtitlingDescriptorTag:
-				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", 
+				Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
 					stream.getPid(), psStreamTypes[stream.getStreamType()], "DVBSUB");
 				return stream.getPid();
 			default:
-				Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s", 
+				Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s\n",
 					stream.getPid(), psStreamTypes[stream.getStreamType()], "UNKNOWN");
 				break;
 			}
@@ -201,7 +201,7 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
 				return stream.getPid();
 			}
 		}
-		Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s",
+		Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s\n",
 			stream.getPid(), psStreamTypes[stream.getStreamType()<0x1c?stream.getStreamType():0], "UNKNOWN");
 		break;
 	}
@@ -221,7 +221,7 @@ void cStreamdevPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, i
 					const cChannel *Channel =  Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId());
 					if (Channel && (Channel == m_Channel)) {
 						if (0 != (pmtPid = assoc.getPid())) {
-							Dprintf("cStreamdevPatFilter: PMT pid for channel %s: %d", Channel->Name(), pmtPid);
+							Dprintf("cStreamdevPatFilter: PMT pid for channel %s: %d\n", Channel->Name(), pmtPid);
 							pmtSid = assoc.getServiceId();
 							if (Length < TS_SIZE-5) {
 								// repack PAT to TS frame and send to client
@@ -286,7 +286,7 @@ void cStreamdevPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, i
 			return; // skip broken PMT records
 		if (pmtVersion != -1) {
 			if (pmtVersion != pmt.getVersionNumber()) {
-				Dprintf("cStreamdevPatFilter: PMT version changed, detaching all pids");
+				Dprintf("cStreamdevPatFilter: PMT version changed, detaching all pids\n");
 				Del(pmtPid, 0x02);
 				pmtPid = 0; // this triggers PAT scan
 			}