r1387 - dvb/linuxtv-dvb-apps/trunk/debian/patches

[Darren Salt]

Author: dsalt-guest
Date: 2005-10-22 22:10:05 +0000 (Sat, 22 Oct 2005)
New Revision: 1387

Modified:
   dvb/linuxtv-dvb-apps/trunk/debian/patches/07_vdr_output.dpatch
Log:
Sync provider name output with upstream CVS.


Modified: dvb/linuxtv-dvb-apps/trunk/debian/patches/07_vdr_output.dpatch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/07_vdr_output.dpatch	2005-10-22 21:36:50 UTC (rev 1386)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/07_vdr_output.dpatch	2005-10-22 22:10:05 UTC (rev 1387)
@@ -23,7 +23,7 @@
  				 int ac3_pid,
                                   int service_id,
  				 int network_id,
-@@ -133,26 +135,38 @@
+@@ -133,26 +135,42 @@
          int i;
  
  	if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) {
@@ -34,12 +34,17 @@
 +		}
  		if ((dump_channum == 1) && (channel_num > 0))
  			fprintf(f, ":@%i\n", channel_num);
- 		if (dump_provider == 1)
+-		if (dump_provider == 1)
 -			fprintf (f, "%s - ", provider_name);
 -		fprintf (f, "%s:", service_name);
++		if (vdr_version >= 3)
 +			fprintf (f, "%s;%s:", service_name, provider_name);
 +		else
-+			fprintf (f, "%s:", service_name);
++		  {
++		    if (dump_provider == 1)
++		      fprintf (f, "%s - ", provider_name);
++		    fprintf (f, "%s:", service_name);
++		  }
  		vdr_dump_dvb_parameters (f, type, p, polarity, orbital_pos, we_flag);
  		if ((pcr_pid != video_pid) && (video_pid > 0))
  			fprintf (f, "%i+%i:", video_pid, pcr_pid);