From patchwork Fri Aug 3 10:26:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Roth?= X-Patchwork-Id: 1270311 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id ECDE73FD56 for ; Fri, 3 Aug 2012 10:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753312Ab2HCK1s (ORCPT ); Fri, 3 Aug 2012 06:27:48 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:38737 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230Ab2HCK1m (ORCPT ); Fri, 3 Aug 2012 06:27:42 -0400 Received: by wibhm11 with SMTP id hm11so6042475wib.1 for ; Fri, 03 Aug 2012 03:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=JMfgMWG1FfmAUEjoNVuhkU2wu9pCIY/f7MmnV6inRZk=; b=cFoVaJ4mxetmkLzhxLORFLgMiXCK6NQL2LEwyk2H7x81WJrzdOTslCE3XdkXxBiRCJ vjpD2cLuxPiE114N3+fsgNgGt5FaEM6c+axktWjhqJayEwhG5nrrR1YT85ZRCGAqEVIZ OqFih1nu/Ce2gu4Lh8sdpjpO0tTPJpYoAYIouDhflqZ8Y+5Hqe6Kf8jY2iqaO9jbA3oo OEJb3ttJxtACXn2eG60ZyxfYJlmOd3ShsbjHoc/v+NCby1ac7dz12107rSse6eEdDdUe 0Fpjxxx9EhI2O3+1lSLSwrSy4kPfF+DrkS17NmzhBqXegrb/jbIuJnyDDVhqDAlxE65v e3NQ== Received: by 10.180.86.106 with SMTP id o10mr3182913wiz.22.1343989661101; Fri, 03 Aug 2012 03:27:41 -0700 (PDT) Received: from localhost.localdomain (104-38.60-188.cust.bluewin.ch. [188.60.38.104]) by mx.google.com with ESMTPS id fb20sm24830570wid.1.2012.08.03.03.27.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Aug 2012 03:27:40 -0700 (PDT) From: =?UTF-8?q?Andr=C3=A9=20Roth?= To: linux-media@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Roth?= Subject: [PATCH 3/6] libdvbv5: dvb_dmx_open nonblocking Date: Fri, 3 Aug 2012 12:26:56 +0200 Message-Id: <1343989619-12928-3-git-send-email-neolynx@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343989619-12928-1-git-send-email-neolynx@gmail.com> References: <1343989619-12928-1-git-send-email-neolynx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: André Roth --- lib/include/dvb-demux.h | 2 +- lib/libdvbv5/dvb-demux.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/include/dvb-demux.h b/lib/include/dvb-demux.h index 25cd56c..afd6840 100644 --- a/lib/include/dvb-demux.h +++ b/lib/include/dvb-demux.h @@ -35,7 +35,7 @@ extern "C" { #endif -int dvb_dmx_open(int adapter, int demux, unsigned verbose); +int dvb_dmx_open(int adapter, int demux); void dvb_dmx_close(int dmx_fd); int dvb_set_pesfilter(int dmxfd, int pid, dmx_pes_type_t type, dmx_output_t output, int buffersize); diff --git a/lib/libdvbv5/dvb-demux.c b/lib/libdvbv5/dvb-demux.c index 138b58a..d07e6cf 100644 --- a/lib/libdvbv5/dvb-demux.c +++ b/lib/libdvbv5/dvb-demux.c @@ -40,11 +40,11 @@ #include "dvb-demux.h" -int dvb_dmx_open(int adapter, int demux, unsigned verbose) +int dvb_dmx_open(int adapter, int demux) { char* demux_name = NULL; asprintf(&demux_name, "/dev/dvb/adapter%i/demux%i", adapter, demux ); - int fd_demux = open( demux_name, O_RDWR ); + int fd_demux = open( demux_name, O_RDWR | O_NONBLOCK ); free( demux_name ); return fd_demux; }