summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Ajanki <antti.ajanki@iki.fi>2010-08-25 22:27:43 +0300
committerAntti Ajanki <antti.ajanki@iki.fi>2010-08-25 22:27:43 +0300
commitd7dc6d675b32f4d2c0cadf657c49a9828ead2a9f (patch)
treef3c2d045addb844f24bd09cb1bc429606f9bd005
parent2e849b6887264222d3cade5293a5f07b6776875b (diff)
downloadvdr-plugin-webvideo-d7dc6d675b32f4d2c0cadf657c49a9828ead2a9f.tar.gz
vdr-plugin-webvideo-d7dc6d675b32f4d2c0cadf657c49a9828ead2a9f.tar.bz2
install examples/webvi*.conf in Makefile
-rw-r--r--HISTORY1
-rw-r--r--Makefile9
-rw-r--r--debian/vdr-plugin-webvideo.install2
-rw-r--r--examples/webvi.conf20
-rw-r--r--examples/webvi.plugin.conf (renamed from debian/webvi.plugin.conf)0
5 files changed, 29 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 74a562f..0724fed 100644
--- a/HISTORY
+++ b/HISTORY
@@ -198,3 +198,4 @@ Video site modules:
- New video service: MoonTV (contributed by Matti Lehtimäki)
- ruutu.fi uses rtmpe for some videos
- Possibility to run a script after downloading
+- Stream low bandwidth Youtube videos by default (see /etc/webvi.conf)
diff --git a/Makefile b/Makefile
index 899da9e..b069d07 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,10 @@ build-python: webvi.conf
python setup.py build
webvi.conf:
- @echo "[webvi]\n\ntemplatepath = $(PREFIX)/share/webvi/templates" > webvi.conf
+ sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < examples/webvi.conf > webvi.conf
+
+webvi.plugin.conf:
+ cp -f examples/webvi.plugin.conf webvi.plugin.conf
$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION): vdr-plugin
mkdir -p $(VDRPLUGINDIR)
@@ -53,8 +56,10 @@ install-libwebvi: libwebvi
install-python:
python setup.py install --prefix $(PREFIX)
-install-conf: webvi.conf
+install-conf: webvi.conf webvi.plugin.conf
cp -f webvi.conf /etc/
+ mkdir -p $(VDRPLUGINCONFDIR)/webvideo
+ cp -f webvi.plugin.conf $(VDRPLUGINCONFDIR)/webvideo
install-webvi: install-libwebvi install-python
diff --git a/debian/vdr-plugin-webvideo.install b/debian/vdr-plugin-webvideo.install
index 0cf0829..b9cecb7 100644
--- a/debian/vdr-plugin-webvideo.install
+++ b/debian/vdr-plugin-webvideo.install
@@ -3,4 +3,4 @@ debian/tmp/usr/share/locale
debian/tmp/var/lib/vdr/plugins/webvideo
debian/plugin.webvideo.conf etc/vdr/plugins/
src/vdr-plugin/mime.types var/lib/vdr/plugins/webvideo/
-debian/webvi.plugin.conf var/lib/vdr/plugins/webvideo/
+examples/webvi.plugin.conf var/lib/vdr/plugins/webvideo/
diff --git a/examples/webvi.conf b/examples/webvi.conf
new file mode 100644
index 0000000..37dcade
--- /dev/null
+++ b/examples/webvi.conf
@@ -0,0 +1,20 @@
+[webvi]
+
+# streamplayer1 to streamplayer9 are alternative media players to be
+# used for streaming. The substring %s will be replaced by the stream
+# URL. The players are tried one by one starting from streamplayer1
+# until one of them succeeds playing the stream.
+#
+#streamplayer1 = vlc "%s"
+#streamplayer2 = totem "%s"
+#streamplayer3 = mplayer "%s"
+#streamplayer4 = xine "%s"
+
+# templatepath is path to the video service template directory
+templatepath = /usr/local/share/webvi/templates
+
+[site-youtube]
+
+# Limit the quality when streaming to make the playback smooth even if
+# the network connection is slow.
+stream-max-quality = 50
diff --git a/debian/webvi.plugin.conf b/examples/webvi.plugin.conf
index 675f8d7..675f8d7 100644
--- a/debian/webvi.plugin.conf
+++ b/examples/webvi.plugin.conf