From 9ae960382046c178fd0f6766722e03f6bc35a718 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 13 Nov 2011 22:16:23 +0000 Subject: [PATCH] packages/scpa5xx-view: use lowercase config option, use new service functions SVN-Revision: 29078 --- multimedia/spca5xx-view/Makefile | 4 +-- multimedia/spca5xx-view/files/servfox.config | 6 ++--- multimedia/spca5xx-view/files/servfox.init | 28 ++++++++------------ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/multimedia/spca5xx-view/Makefile b/multimedia/spca5xx-view/Makefile index 336d4ae938..e36b978639 100644 --- a/multimedia/spca5xx-view/Makefile +++ b/multimedia/spca5xx-view/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spca5xx-view PKG_VERSION:=1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=spca5xx-view.tar.bz2 PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt diff --git a/multimedia/spca5xx-view/files/servfox.config b/multimedia/spca5xx-view/files/servfox.config index 3138bba88b..34f4f7fc4b 100644 --- a/multimedia/spca5xx-view/files/servfox.config +++ b/multimedia/spca5xx-view/files/servfox.config @@ -1,4 +1,4 @@ config servfox - option Device '/dev/video0' - option Port '7070' - option Resolution '640x480' + option device '/dev/video0' + option port '7070' + option resolution '640x480' diff --git a/multimedia/spca5xx-view/files/servfox.init b/multimedia/spca5xx-view/files/servfox.init index 072e595b3f..22a4aa25d6 100644 --- a/multimedia/spca5xx-view/files/servfox.init +++ b/multimedia/spca5xx-view/files/servfox.init @@ -1,31 +1,25 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org + START=90 -config_cb() { - local cfg="$CONFIG_SECTION" +satrt_instance() { + local cfg="$1" local res local dev local port - local cfgt - config_get cfgt "$cfg" TYPE - - case "$cfgt" in - servfox) - config_get res $cfg Resolution - config_get dev $cfg Device - config_get port $cfg Port - SERVFOX_ARGS="${dev:+-d $dev} ${res:+-s $res} ${port:+-w $port}" - ;; - esac + config_get res "$cfg" 'resolution' + config_get dev "$cfg" 'device' + config_get port "$cfg" 'port' + service_start bin/servfox ${dev:+-d $dev} ${res:+-s $res} ${port:+-w $port} } start() { - config_load servfox - /bin/servfox $SERVFOX_ARGS & + config_load 'servfox' + config_foreach start_instance 'servfox' } stop() { - killall servfox + service_stop /bin/servfox } -- 2.30.2