From 87bed5db45430fd69d7d89b30e1c6dae46d05e7c Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 1 Sep 2008 21:56:30 +0000 Subject: [PATCH] Added UVC-Streamer application Contributed by Yanira Thanks a lot --- applications/luci-uvc_streamer/Makefile | 2 ++ applications/luci-uvc_streamer/ipkg/postinst | 4 ++++ .../luasrc/controller/uvc_streamer.lua | 13 +++++++++++++ .../luasrc/i18n/uvc_streamer.de.lua | 4 ++++ .../luasrc/i18n/uvc_streamer.de.xml | 10 ++++++++++ .../luasrc/i18n/uvc_streamer.en.lua | 4 ++++ .../luasrc/i18n/uvc_streamer.en.xml | 10 ++++++++++ .../luasrc/model/cbi/uvc_streamer.lua | 20 ++++++++++++++++++++ .../root/etc/uci-defaults/luci-uvc_streamer | 4 ++++ contrib/package/luci/Makefile | 16 ++++++++++++++++ 10 files changed, 87 insertions(+) create mode 100644 applications/luci-uvc_streamer/Makefile create mode 100755 applications/luci-uvc_streamer/ipkg/postinst create mode 100644 applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua create mode 100644 applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua create mode 100644 applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml create mode 100644 applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua create mode 100644 applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml create mode 100644 applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua create mode 100644 applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer diff --git a/applications/luci-uvc_streamer/Makefile b/applications/luci-uvc_streamer/Makefile new file mode 100644 index 000000000..81a96f6a8 --- /dev/null +++ b/applications/luci-uvc_streamer/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/applications/luci-uvc_streamer/ipkg/postinst b/applications/luci-uvc_streamer/ipkg/postinst new file mode 100755 index 000000000..492bc858c --- /dev/null +++ b/applications/luci-uvc_streamer/ipkg/postinst @@ -0,0 +1,4 @@ +#!/bin/sh +[ -n "${IPKG_INSTROOT}" ] || { + ( . /etc/uci-defaults/luci-uvc_streamer ) && rm -f /etc/uci-defaults/luci-uvc_streamer +} diff --git a/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua new file mode 100644 index 000000000..a1f229671 --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua @@ -0,0 +1,13 @@ +module("luci.controller.uvc_streamer", package.seeall) + +function index() + require("luci.i18n") + luci.i18n.loadc("uvc_streamer") + if not luci.fs.isfile("/etc/config/uvc-streamer") then + return + end + + local page = entry({"admin", "services", "uvc_streamer"}, cbi("uvc_streamer"), luci.i18n.translate("uvc_streamer", "UVC Streaming"), 60) + page.i18n = "uvc_streamer" + page.dependent = true +end diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua new file mode 100644 index 000000000..cd7cb431f --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua @@ -0,0 +1,4 @@ +uvc_streamer = [[Webcam Stream]] +settings = [[Konfiguration]] +resolution = [[Auflösung]] +framespersecond = [[Bilder pro Sekunde]] diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml new file mode 100644 index 000000000..91150963f --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml @@ -0,0 +1,10 @@ + + + + +Bilder pro Sekunde +Auflösung +Konfiguration +Webcam Stream + + diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua new file mode 100644 index 000000000..46c933158 --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua @@ -0,0 +1,4 @@ +uvc_streamer = [[Webcam streaming]] +settings = [[Settings]] +resolution = [[Resolution]] +framespersecond = [[Frames per second]] diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml new file mode 100644 index 000000000..8fe64804d --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml @@ -0,0 +1,10 @@ + + + + +Frames per second +Resolution +Settings +Webcam streaming + + diff --git a/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua b/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua new file mode 100644 index 000000000..69a652512 --- /dev/null +++ b/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua @@ -0,0 +1,20 @@ +m = Map("uvc-streamer", translate("uvc_streamer")) + +s = m:section(TypedSection, "uvc-streamer", translate("settings")) +s.addremove = false +s.anonymous = true + +s:option(Flag, "enabled", translate("enabled", "Enable")) + +s:option(Value, "device", translate("device")).rmempty = true + +nm = s:option(Value, "resolution", translate("resolution")) +nm:value("640x480") +nm:value("320x240") +nm:value("160x120") + +s:option(Value, "framespersecond", translate("framespersecond")).rmempty = true + +s:option(Value, "port", translate("port", "Port")).rmempty = true + +return m diff --git a/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer b/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer new file mode 100644 index 000000000..6ecea2c42 --- /dev/null +++ b/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer @@ -0,0 +1,4 @@ +#!/bin/sh + +uci set luci.uci_oncommit.uvc_streamer='/sbin/luci-reload uvc-streamer' +uci commit luci diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index ba29946c0..f095d5acb 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -510,6 +510,18 @@ define Package/luci-app-samba/install endef +define Package/luci-app-uvc_streamer + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +uvc-streamer + TITLE:=Webcam Streaming - UVC-Streamer module +endef + +define Package/luci-app-uvc_streamer/install + $(call Package/luci/install/template,$(1),applications/luci-uvc_streamer) +endef + + + ### Server Gateway Interfaces ### define Package/luci-sgi-cgi @@ -710,6 +722,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-samba),) PKG_SELECTED_MODULES+=applications/luci-samba endif +ifneq ($(CONFIG_PACKAGE_luci-app-uvc_streamer),) + PKG_SELECTED_MODULES+=applications/luci-uvc_streamer +endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) @@ -790,6 +805,7 @@ $(eval $(call BuildPackage,luci-app-upnp)) $(eval $(call BuildPackage,luci-app-ntpc)) $(eval $(call BuildPackage,luci-app-ddns)) $(eval $(call BuildPackage,luci-app-samba)) +$(eval $(call BuildPackage,luci-app-uvc_streamer)) $(eval $(call BuildPackage,luci-sgi-cgi)) $(eval $(call BuildPackage,luci-sgi-luci)) -- 2.11.0