mirror of
https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git
synced 2023-10-10 19:16:51 +02:00
Streamdev 0.5.0
This commit is contained in:
Frank Schmirler
parent
91c5199ac3
commit
e0a00f90ae
@ -150,3 +150,10 @@ Eric Valette
|
||||
|
||||
carel
|
||||
for reporting "plugin doesn't honor APIVERSION" error in new Makefile
|
||||
for helping to find a way to cleanly shutdown externremux with mencoder
|
||||
|
||||
wolfi.m
|
||||
for reporting a typo in externermux quality parameter value
|
||||
|
||||
Norman Thiel
|
||||
for reporting a wrong URL path in m3u playlists
|
||||
|
||||
14
HISTORY
14
HISTORY
@ -1,6 +1,20 @@
|
||||
VDR Plugin 'streamdev' Revision History
|
||||
---------------------------------------
|
||||
|
||||
2010-07-20: Version 0.5.0b
|
||||
|
||||
- fixed wrong URL path in m3u playlists (reported by Norman Thiel)
|
||||
|
||||
2010-07-20: Version 0.5.0a
|
||||
|
||||
- set externremux.sh executable in distribution archive
|
||||
- externremux quality value should be wlan54, not wlan45 (reported by
|
||||
wolfi.m@vdrportal)
|
||||
|
||||
2010-07-19: Version 0.5.0
|
||||
|
||||
- using SIGINT in externremux to kill mencoder works better than SIGTERM;
|
||||
especially x264 still needs a SIGKILL sometimes
|
||||
- added --remove-destination to cp commands installing plugins
|
||||
- fixed "plugin doesn't honor APIVERSION" (reported by carel@vdrportal)
|
||||
- updated Italian translation (thanks to Diego Pierotto)
|
||||
|
||||
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.21.2.2 2010/06/20 19:11:15 schmirl Exp $
|
||||
# $Id: Makefile,v 1.22 2010/07/19 13:49:24 schmirl Exp $
|
||||
|
||||
# The main source file name.
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $
|
||||
# $Id: Makefile,v 1.2 2010/07/19 13:49:25 schmirl Exp $
|
||||
|
||||
# The official name of this plugin.
|
||||
# This name will be used in the '-P...' option of VDR to load the plugin.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
*
|
||||
* See the README file for copyright information and how to reach the author.
|
||||
*
|
||||
* $Id: streamdev-client.c,v 1.1.2.1 2010/06/14 10:40:11 schmirl Exp $
|
||||
* $Id: streamdev-client.c,v 1.2 2010/07/19 13:49:25 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include "streamdev-client.h"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: streamdev-client.h,v 1.1.2.1 2010/06/14 10:40:11 schmirl Exp $
|
||||
* $Id: streamdev-client.h,v 1.2 2010/07/19 13:49:25 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEVCLIENT_H
|
||||
|
||||
4
common.c
4
common.c
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: common.c,v 1.11.2.1 2010/06/08 07:47:45 schmirl Exp $
|
||||
* $Id: common.c,v 1.12 2010/07/19 13:49:24 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <vdr/channels.h>
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
const char *VERSION = "0.5.0-rc2";
|
||||
const char *VERSION = "0.5.0";
|
||||
|
||||
const char cMenuEditIpItem::IpCharacters[] = "0123456789.";
|
||||
|
||||
|
||||
2
common.h
2
common.h
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: common.h,v 1.15.2.1 2010/06/11 06:06:01 schmirl Exp $
|
||||
* $Id: common.h,v 1.16 2010/07/19 13:49:24 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEV_COMMON_H
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.3.4.1 2010/06/14 10:40:13 schmirl Exp $
|
||||
# $Id: Makefile,v 1.4 2010/07/19 13:49:26 schmirl Exp $
|
||||
|
||||
### The object files (add further files here):
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:18 schmirl Exp $
|
||||
# $Id: Makefile,v 1.2 2010/07/19 13:49:28 schmirl Exp $
|
||||
|
||||
### The object files (add further files here):
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $
|
||||
# $Id: Makefile,v 1.2 2010/07/19 13:49:31 schmirl Exp $
|
||||
|
||||
# The official name of this plugin.
|
||||
# This name will be used in the '-P...' option of VDR to load the plugin.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connection.c,v 1.13.2.1 2010/06/11 06:06:02 schmirl Exp $
|
||||
* $Id: connection.c,v 1.14 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include "server/connection.h"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connection.h,v 1.8.2.1 2010/06/11 06:06:02 schmirl Exp $
|
||||
* $Id: connection.h,v 1.9 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEV_SERVER_CONNECTION_H
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connectionHTTP.c,v 1.17.2.1 2010/06/11 06:06:02 schmirl Exp $
|
||||
* $Id: connectionHTTP.c,v 1.19 2010/07/20 12:26:29 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
@ -336,7 +336,7 @@ bool cConnectionHTTP::ProcessURI(const std::string& PathInfo)
|
||||
|
||||
Dprintf("before channelfromstring: type(%s) filespec(%s) fileext(%s)\n", type.c_str(), filespec.c_str(), fileext.c_str());
|
||||
|
||||
if ((m_ChannelList = ChannelListFromString(PathInfo.substr(0, file_pos), filespec.c_str(), fileext.c_str())) != NULL) {
|
||||
if ((m_ChannelList = ChannelListFromString(PathInfo.substr(1, file_pos), filespec.c_str(), fileext.c_str())) != NULL) {
|
||||
Dprintf("Channel list requested\n");
|
||||
return true;
|
||||
} else if ((m_Channel = ChannelFromString(filespec.c_str(), &m_Apid[0], &m_Dpid[0])) != NULL) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connectionHTTP.h,v 1.6.2.1 2010/06/11 06:06:02 schmirl Exp $
|
||||
* $Id: connectionHTTP.h,v 1.7 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEV_SERVERS_CONNECTIONHTTP_H
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connectionIGMP.c,v 1.1.4.1 2010/06/11 06:06:02 schmirl Exp $
|
||||
* $Id: connectionIGMP.c,v 1.2 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: connectionVTP.c,v 1.27.2.1 2010/06/11 06:06:03 schmirl Exp $
|
||||
* $Id: connectionVTP.c,v 1.28 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include "server/connectionVTP.h"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: setup.c,v 1.9.2.2 2010/06/18 19:07:32 schmirl Exp $
|
||||
* $Id: setup.c,v 1.10 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <vdr/menuitems.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: setup.h,v 1.3.2.1 2010/06/18 19:07:32 schmirl Exp $
|
||||
* $Id: setup.h,v 1.4 2010/07/19 13:49:31 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEV_SETUPSERVER_H
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
*
|
||||
* See the README file for copyright information and how to reach the author.
|
||||
*
|
||||
* $Id: streamdev-server.c,v 1.1.2.1 2010/06/14 10:40:20 schmirl Exp $
|
||||
* $Id: streamdev-server.c,v 1.2 2010/07/19 13:49:32 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: streamdev-server.h,v 1.1.2.1 2010/06/14 10:40:20 schmirl Exp $
|
||||
* $Id: streamdev-server.h,v 1.2 2010/07/19 13:49:32 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEVSERVER_H
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: streamer.c,v 1.19.2.1 2010/06/11 06:06:03 schmirl Exp $
|
||||
* $Id: streamer.c,v 1.20 2010/07/19 13:49:32 schmirl Exp $
|
||||
*/
|
||||
|
||||
#include <vdr/ringbuffer.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: streamer.h,v 1.11.2.1 2010/06/11 06:06:03 schmirl Exp $
|
||||
* $Id: streamer.h,v 1.12 2010/07/19 13:49:32 schmirl Exp $
|
||||
*/
|
||||
|
||||
#ifndef VDR_STREAMDEV_STREAMER_H
|
||||
|
||||
@ -225,14 +225,13 @@ function startReply
|
||||
|
||||
# create FIFO and read from it in the background
|
||||
mkfifo "$FIFO"
|
||||
trap "kill 0; sleep 1; rm '$FIFO'; trap - EXIT HUP INT TERM ABRT PIPE CHLD" EXIT HUP INT TERM ABRT PIPE CHLD
|
||||
trap "trap '' EXIT HUP INT TERM ABRT PIPE CHLD; kill -INT 0; sleep 1; fuser -k '$FIFO'; rm '$FIFO'" EXIT HUP INT TERM ABRT PIPE CHLD
|
||||
cat "$FIFO" <&- &
|
||||
}
|
||||
|
||||
HEADER=()
|
||||
|
||||
set > /tmp/env
|
||||
[ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] streamdev EXT" 2>&-)
|
||||
[ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] ${0##*/}" 2>&-)
|
||||
|
||||
# set default content-types
|
||||
case "$REMUX_VPID" in
|
||||
@ -242,14 +241,14 @@ esac
|
||||
|
||||
QUALITY=${REMUX_PARAM_QUALITY:-$QUALITY}
|
||||
case "$QUALITY" in
|
||||
DSL1000) VBR=96; ABR=16; WIDTH=160;;
|
||||
DSL2000) VBR=128; ABR=16; WIDTH=160;;
|
||||
DSL3000) VBR=256; ABR=16; WIDTH=320;;
|
||||
DSL6000) VBR=378; ABR=32; WIDTH=320;;
|
||||
DSL16000) VBR=512; ABR=32; WIDTH=480;;
|
||||
WLAN11) VBR=768; ABR=64; WIDTH=640;;
|
||||
WLAN45) VBR=2048; ABR=128; WIDTH=;;
|
||||
LAN10) VBR=4096; ABR=; WIDTH=;;
|
||||
DSL1000|dsl1000) VBR=96; ABR=16; WIDTH=160;;
|
||||
DSL2000|dsl2000) VBR=128; ABR=16; WIDTH=160;;
|
||||
DSL3000|dsl3000) VBR=256; ABR=16; WIDTH=320;;
|
||||
DSL6000|dsl6000) VBR=378; ABR=32; WIDTH=320;;
|
||||
DSL16000|dsl16000) VBR=512; ABR=32; WIDTH=480;;
|
||||
WLAN11|wlan11) VBR=768; ABR=64; WIDTH=640;;
|
||||
WLAN54|wlan54) VBR=2048; ABR=128; WIDTH=;;
|
||||
LAN10|lan10) VBR=4096; ABR=; WIDTH=;;
|
||||
*) error "Unknown quality '$QUALITY'";;
|
||||
esac
|
||||
ABR=${REMUX_PARAM_ABR:-$ABR}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for a Video Disk Recorder plugin
|
||||
#
|
||||
# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:31 schmirl Exp $
|
||||
# $Id: Makefile,v 1.2 2010/07/19 13:49:44 schmirl Exp $
|
||||
|
||||
### The object files (add further files here):
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user