From patchwork Tue Mar 15 12:32:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 636041 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FCVJKh020483 for ; Tue, 15 Mar 2011 12:31:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757583Ab1COMbR (ORCPT ); Tue, 15 Mar 2011 08:31:17 -0400 Received: from chybek.jannau.net ([83.169.20.219]:53722 "EHLO chybek.jannau.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757552Ab1COMbR (ORCPT ); Tue, 15 Mar 2011 08:31:17 -0400 Received: from aniel.jannau.net (p5DDC4A86.dip0.t-ipconnect.de [93.220.74.134]) by chybek.jannau.net (Postfix) with ESMTPSA id 40E4853E05A6; Tue, 15 Mar 2011 13:31:15 +0100 (CET) Date: Tue, 15 Mar 2011 13:32:58 +0100 From: Janne Grunau To: Christian Ulrich Cc: linux-media@vger.kernel.org Subject: Re: [PATCH] DVB-APPS: azap gets -p argument Message-ID: <20110315123258.GA6570@aniel> References: <20110315121126.GD8113@aniel> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 15 Mar 2011 12:31:20 +0000 (UTC) diff -r 4746d76ae4b6 util/szap/czap.c --- a/util/szap/czap.c Sat Mar 05 18:39:58 2011 +0100 +++ b/util/szap/czap.c Tue Mar 15 13:32:29 2011 +0100 @@ -253,7 +253,7 @@ " -x : exit after tuning\n" " -H : human readable output\n" " -r : set up /dev/dvb/adapterX/dvr0 for TS recording\n" - " -p : add pat and pmt to TS recording (implies -r)\n" + " -p : obsolete (pat and pmt will always be included with -r)\n" ; int main(int argc, char **argv) @@ -279,8 +279,11 @@ case 'd': demux = strtoul(optarg, NULL, 0); break; + case 'p': + printf("'-p' is obsolete. '-r' records PAT/PMT"); case 'r': dvr = 1; + rec_psi = 1; break; case 'l': list_channels = 1; @@ -288,9 +291,6 @@ case 'n': chan_no = strtoul(optarg, NULL, 0); break; - case 'p': - rec_psi = 1; - break; case 'x': exit_after_tuning = 1; break; diff -r 4746d76ae4b6 util/szap/szap.c --- a/util/szap/szap.c Sat Mar 05 18:39:58 2011 +0100 +++ b/util/szap/szap.c Tue Mar 15 13:32:29 2011 +0100 @@ -547,8 +547,11 @@ case 'q': list_channels = 1; break; + case 'p': + printf("'-p' is obsolete. '-r' records PAT/PMT"); case 'r': dvr = 1; + rec_psi = 1; break; case 'n': chan_no = strtoul(optarg, NULL, 0); @@ -559,9 +562,6 @@ case 'f': frontend = strtoul(optarg, NULL, 0); break; - case 'p': - rec_psi = 1; - break; case 'd': demux = strtoul(optarg, NULL, 0); break; diff -r 4746d76ae4b6 util/szap/tzap.c --- a/util/szap/tzap.c Sat Mar 05 18:39:58 2011 +0100 +++ b/util/szap/tzap.c Tue Mar 15 13:32:29 2011 +0100 @@ -485,7 +485,7 @@ " -c file : read channels list from 'file'\n" " -x : exit after tuning\n" " -r : set up /dev/dvb/adapterX/dvr0 for TS recording\n" - " -p : add pat and pmt to TS recording (implies -r)\n" + " -p : obsolete (pat and pmt will always be included with -r)\n" " -s : only print summary\n" " -S : run silently (no output)\n" " -H : human readable output\n" @@ -529,10 +529,10 @@ filename = strdup(optarg); record=1; /* fall through */ + case 'p': + printf("'-p' is obsolete. '-r' records PAT/PMT"); case 'r': dvr = 1; - break; - case 'p': rec_psi = 1; break; case 'x':