Attachment #91200 for bug #135788




                   "       -outfile <path>     \t: target file for export and other output\n"
                   "       -dump xml|html|pi|...\t: export database in various formats\n"
                   "       -provider <cni>     \t: network id of EPG provider (hex)\n"
                   "       -card <digit>       \t: index of TV card for acq (starting at 0)\n"
                   "       -dvbpid <digit>     \t: Use DVB with this pid\n";
   const char * const pGuiUsage =
                   "       -remctrl <cmd>      \t: remote control nxtvepg\n"
                   "       -demo <db-file>     \t: load database in demo mode\n"

            else
               Usage(argv[0], argv[argIdx], "missing card index after");
         }
         else if (!strcmp(argv[argIdx], "-dvbpid"))
         {
            if (argIdx + 1 < argc)
            {  // read PID for DVB
               char *pe;
               ulong dvbPid = strtol(argv[argIdx + 1], &pe, 0);
               if ((pe != (argv[argIdx + 1] + strlen(argv[argIdx + 1]))))
                  MainOptionError(argv[0], argv[argIdx+1], "invalid value for -dvbpid");
               mainOpts.dvbPid = (int) dvbPid;
               argIdx += 2;
            }
            else
               Usage(argv[0], argv[argIdx], "missing card index after");
         }
         else if ( !strcmp(argv[argIdx], "-provider") ||
                   !strcmp(argv[argIdx], "-prov") )
         {

#endif
   mainOpts.dbdir  = NULL;
   mainOpts.videoCardIndex = -1;
   mainOpts.dvbPid = -1;
   mainOpts.disableAcq = FALSE;
   mainOpts.optDaemonMode = FALSE;
   mainOpts.optDumpMode = EPG_DUMP_NONE;

Lines 78-83 Link Here

(-)nxtvepg-2.8.0pre10/epgui/cmdline.h (+1 lines)
78	const char * rcfile;	78	const char * rcfile;
79	const char * dbdir;	79	const char * dbdir;
80	int videoCardIndex;	80	int videoCardIndex;
		81	int dvbPid;
81	bool disableAcq;	82	bool disableAcq;
82	EPG_DAEMON_MODE optDaemonMode;	83	EPG_DAEMON_MODE optDaemonMode;
83	EPG_DUMP_MODE optDumpMode;	84	EPG_DUMP_MODE optDumpMode;

Lines 553-559 Link Here

(-)nxtvepg-2.8.0pre10/epgui/epgsetup.c (-1 / +1 lines)
553	#endif	553	#endif
554	// pass the hardware config params to the driver	554	// pass the hardware config params to the driver
555	if (BtDriver_Configure(cardIdx, drvType, prio, chipType, cardType, tuner, pll, wdmStop))	555	if (BtDriver_Configure(cardIdx, drvType, mainOpts.dvbPid, prio, chipType, cardType, tuner, pll, wdmStop))
556	{	556	{
557	// pass the input selection to acquisition control	557	// pass the input selection to acquisition control
558	EpgAcqCtl_SetInputSource(input, slicer);	558	EpgAcqCtl_SetInputSource(input, slicer);

Lines 251-256 Link Here

(-)nxtvepg-2.8.0pre10/epgvbi/btdrv.h (-1 / +2 lines)
251	uint vbiQueryFreq;	251	uint vbiQueryFreq;
252	uchar cardIndex;	252	uchar cardIndex;
		253	int dvbPid;
253	uint slicerType;	254	uint slicerType;
254	# if defined(__NetBSD__) \|\| defined(__FreeBSD__)	255	# if defined(__NetBSD__) \|\| defined(__FreeBSD__)
255	uchar inputIndex;	256	uchar inputIndex;
Lines 306-312 Link Here
306	void BtDriver_ScanDevices( bool isMasterProcess );	307	void BtDriver_ScanDevices( bool isMasterProcess );
307	#endif	308	#endif
308	const char * BtDriver_GetInputName( uint cardIdx, uint cardType, uint drvType, uint inputIdx );	309	const char * BtDriver_GetInputName( uint cardIdx, uint cardType, uint drvType, uint inputIdx );
309	bool BtDriver_Configure( int sourceIdx, int drvType, int prio, int chipType, int cardType,	310	bool BtDriver_Configure( int sourceIdx, int drvType, int dvbPid, int prio, int chipType, int cardType,
310	int tunerType, int pllType, bool wdmStop );	311	int tunerType, int pllType, bool wdmStop );
311	void BtDriver_SelectSlicer( VBI_SLICER_TYPE slicerType );	312	void BtDriver_SelectSlicer( VBI_SLICER_TYPE slicerType );
312	#ifndef WIN32	313	#ifndef WIN32

Lines 173-178 Link Here

(-)nxtvepg-2.8.0pre10/epgvbi/btdrv4linux.c (-3 / +15 lines)
173	// vars used in the acq slave process	173	// vars used in the acq slave process
174	static bool acqShouldExit;	174	static bool acqShouldExit;
175	static int vbiCardIndex;	175	static int vbiCardIndex;
		176	static int vbiDvbPid;
176	static int vbi_fdin;	177	static int vbi_fdin;
177	#ifndef USE_LIBZVBI	178	#ifndef USE_LIBZVBI
178	static int bufLineSize;	179	static int bufLineSize;
Lines 205-210 Link Here
205	#if defined(__NetBSD__) \|\| defined(__FreeBSD__)	206	#if defined(__NetBSD__) \|\| defined(__FreeBSD__)
206	DEV_TYPE_TUNER,	207	DEV_TYPE_TUNER,
207	#endif	208	#endif
		209	DEV_TYPE_DVB,
208	} BTDRV_DEV_TYPE;	210	} BTDRV_DEV_TYPE;
209	// ---------------------------------------------------------------------------	211	// ---------------------------------------------------------------------------
Lines 234-239 Link Here
234	case DEV_TYPE_VBI:	236	case DEV_TYPE_VBI:
235	sprintf(devName, "%s/vbi%u", pDevPath, cardIdx);	237	sprintf(devName, "%s/vbi%u", pDevPath, cardIdx);
236	break;	238	break;
		239	case DEV_TYPE_DVB:
		240	sprintf(devName, "/dev/dvb/adapter%u/demux0", cardIdx);
		241	break;
237	default:	242	default:
238	strcpy(devName, "/dev/null");	243	strcpy(devName, "/dev/null");
239	fatal1("BtDriver-GetDevicePath: illegal device type %d", devType);	244	fatal1("BtDriver-GetDevicePath: illegal device type %d", devType);
Lines 457-462 Link Here
457	#endif	462	#endif
458	vbiCardIndex = pVbiBuf->cardIndex;	463	vbiCardIndex = pVbiBuf->cardIndex;
		464	vbiDvbPid = pVbiBuf->dvbPid;
459	pVbiBuf->is_v4l2 = FALSE;	465	pVbiBuf->is_v4l2 = FALSE;
460	#if defined(__NetBSD__) \|\| defined(__FreeBSD__)	466	#if defined(__NetBSD__) \|\| defined(__FreeBSD__)
Lines 534-543 Link Here
534	pZvbiCapt = vbi_capture_v4l_new(pDevName, 0, &services, 0, &pErrStr, ZVBI_TRACE);	540	pZvbiCapt = vbi_capture_v4l_new(pDevName, 0, &services, 0, &pErrStr, ZVBI_TRACE);
535	}	541	}
536	#if (VBI_VERSION_MAJOR>0) \|\| (VBI_VERSION_MINOR>2) \|\| (VBI_VERSION_MICRO >= 6)	542	#if (VBI_VERSION_MAJOR>0) \|\| (VBI_VERSION_MINOR>2) \|\| (VBI_VERSION_MICRO >= 6)
537	if (pZvbiCapt == NULL)	543	if ((pZvbiCapt == NULL) && (vbiDvbPid!=-1))
538	{	544	{
		545	char *pDvbDevName = BtDriver_GetDevicePath(DEV_TYPE_DVB, vbiCardIndex);
539	services = VBI_SLICED_TELETEXT_B;	546	services = VBI_SLICED_TELETEXT_B;
540	pZvbiCapt = vbi_capture_dvb_new(pDevName, 0, &services, 0, &pErrStr, ZVBI_TRACE);	547	pZvbiCapt = vbi_capture_dvb_new(pDvbDevName, 0, &services, 0, &pErrStr, ZVBI_TRACE);
		548	if (pZvbiCapt != NULL)
		549	{
		550	vbi_capture_dvb_filter(pZvbiCapt, vbiDvbPid);
		551	}
541	}	552	}
542	#endif	553	#endif
Lines 1465-1471 Link Here
1465	// hence these parameters can be ignored in Linux	1476	// hence these parameters can be ignored in Linux
1466	// - there isn't any need for priority adaptions, so that's not supported either	1477	// - there isn't any need for priority adaptions, so that's not supported either
1467	//	1478	//
1468	bool BtDriver_Configure( int cardIndex, int drvType, int prio, int chipType, int cardType,	1479	bool BtDriver_Configure( int cardIndex, int drvType, int dvbPid, int prio, int chipType, int cardType,
1469	int tunerType, int pllType, bool wdmStop )	1480	int tunerType, int pllType, bool wdmStop )
1470	{	1481	{
1471	struct timeval tv;	1482	struct timeval tv;
Lines 1476-1481 Link Here
1476	// pass the new card index to the slave via shared memory	1487	// pass the new card index to the slave via shared memory
1477	pVbiBuf->cardIndex = cardIndex;	1488	pVbiBuf->cardIndex = cardIndex;
		1489	pVbiBuf->dvbPid = dvbPid;
1478	if (wasEnabled)	1490	if (wasEnabled)
1479	{ // wait 30ms for the slave to process the request	1491	{ // wait 30ms for the slave to process the request

Return to bug 135788

Lines 168-175 Link Here

(-)nxtvepg-2.8.0pre10/epgui/cmdline.c (-2 / +17 lines)
168	" -outfile <path> \t: target file for export and other output\n"	168	" -outfile <path> \t: target file for export and other output\n"
169	" -dump xml\|html\|pi\|...\t: export database in various formats\n"	169	" -dump xml\|html\|pi\|...\t: export database in various formats\n"
170	" -provider <cni> \t: network id of EPG provider (hex)\n"	170	" -provider <cni> \t: network id of EPG provider (hex)\n"
171	" -card <digit> \t: index of TV card for acq (starting at 0)\n";	171	" -card <digit> \t: index of TV card for acq (starting at 0)\n"
172		172	" -dvbpid <digit> \t: Use DVB with this pid\n";
173	const char * const pGuiUsage =	173	const char * const pGuiUsage =
174	" -remctrl <cmd> \t: remote control nxtvepg\n"	174	" -remctrl <cmd> \t: remote control nxtvepg\n"
175	" -demo <db-file> \t: load database in demo mode\n"	175	" -demo <db-file> \t: load database in demo mode\n"
Lines 568-573 Link Here
568	else	568	else
569	Usage(argv[0], argv[argIdx], "missing card index after");	569	Usage(argv[0], argv[argIdx], "missing card index after");
570	}	570	}
		571	else if (!strcmp(argv[argIdx], "-dvbpid"))
		572	{
		573	if (argIdx + 1 < argc)
		574	{ // read PID for DVB
		575	char *pe;
		576	ulong dvbPid = strtol(argv[argIdx + 1], &pe, 0);
		577	if ((pe != (argv[argIdx + 1] + strlen(argv[argIdx + 1]))))
		578	MainOptionError(argv[0], argv[argIdx+1], "invalid value for -dvbpid");
		579	mainOpts.dvbPid = (int) dvbPid;
		580	argIdx += 2;
		581	}
		582	else
		583	Usage(argv[0], argv[argIdx], "missing card index after");
		584	}
571	else if ( !strcmp(argv[argIdx], "-provider") \|\|	585	else if ( !strcmp(argv[argIdx], "-provider") \|\|
572	!strcmp(argv[argIdx], "-prov") )	586	!strcmp(argv[argIdx], "-prov") )
573	{	587	{
Lines 808-813 Link Here
808	#endif	822	#endif
809	mainOpts.dbdir = NULL;	823	mainOpts.dbdir = NULL;
810	mainOpts.videoCardIndex = -1;	824	mainOpts.videoCardIndex = -1;
		825	mainOpts.dvbPid = -1;
811	mainOpts.disableAcq = FALSE;	826	mainOpts.disableAcq = FALSE;
812	mainOpts.optDaemonMode = FALSE;	827	mainOpts.optDaemonMode = FALSE;
813	mainOpts.optDumpMode = EPG_DUMP_NONE;	828	mainOpts.optDumpMode = EPG_DUMP_NONE;