frodovdr/vdr-plugin-iptv
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-iptv.git synced 2023-10-10 13:37:03 +02:00
Code Issues Releases Wiki Activity

Revert non-working retuning optimization.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2008-04-04 20:55:44 +00:00
parent c507f373ff
commit 6fa46ca9e3
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -60,5 +60,4 @@ VDR Plugin 'iptv' Revision History
- Updated Italian translation (Thanks to Diego Pierotto). - Updated Italian translation (Thanks to Diego Pierotto).
- Removed compatibility mode for old channels.conf format. - Removed compatibility mode for old channels.conf format.
- EXT protocol is re-tuned only if iptv parameters differ.
- Updated vlc2iptv script for new channels.conf format. - Updated vlc2iptv script for new channels.conf format.

28
streamer.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: streamer.c,v 1.32 2008/04/02 22:55:04 rahrenbe Exp $ * $Id: streamer.c,v 1.33 2008/04/04 20:55:44 rahrenbe Exp $
*/ */
#include <vdr/thread.h> #include <vdr/thread.h>
@ -16,10 +16,7 @@ cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex)
: cThread("IPTV streamer"), : cThread("IPTV streamer"),
ringBuffer(RingBuffer), ringBuffer(RingBuffer),
mutex(Mutex), mutex(Mutex),
protocol(NULL), protocol(NULL)
location(""),
parameter(-1),
index(-1)
{ {
debug("cIptvStreamer::cIptvStreamer()\n"); debug("cIptvStreamer::cIptvStreamer()\n");
} }
@ -79,17 +76,11 @@ bool cIptvStreamer::Close(void)
// where thread Action() may be in the process of accessing the protocol. // where thread Action() may be in the process of accessing the protocol.
// Taking a mutex serializes the Close() and Action() -calls. // Taking a mutex serializes the Close() and Action() -calls.
if (mutex) if (mutex)
mutex->Lock(); mutex->Lock();
if (protocol) if (protocol)
protocol->Close(); protocol->Close();
if (mutex) if (mutex)
mutex->Unlock(); mutex->Unlock();
// reset stream variables
protocol = NULL;
location = cString("");
parameter = -1;
index = -1;
return true; return true;
} }
@ -97,11 +88,6 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
{ {
debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter); debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
if (!isempty(Location)) { if (!isempty(Location)) {
// Check if (re)tune is needed
//if ((strcmp(*location, Location) == 0) && (parameter == Parameter) && (index == Index) && (protocol == Protocol)) {
// debug("cIptvStreamer::Set(): (Re)tune skipped\n");
// return false;
// }
// Update protocol; Close the existing one if changed // Update protocol; Close the existing one if changed
if (protocol != Protocol) { if (protocol != Protocol) {
if (protocol) if (protocol)
@ -111,12 +97,8 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
protocol->Open(); protocol->Open();
} }
// Set protocol location and parameter // Set protocol location and parameter
if (protocol) { if (protocol)
location = cString(Location); protocol->Set(Location, Parameter, Index);
parameter = Parameter;
index = Index;
protocol->Set(location, parameter, index);
}
} }
return true; return true;
} }

5
streamer.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: streamer.h,v 1.15 2008/04/02 20:22:48 rahrenbe Exp $ * $Id: streamer.h,v 1.16 2008/04/04 20:55:44 rahrenbe Exp $
*/ */
#ifndef __IPTV_STREAMER_H #ifndef __IPTV_STREAMER_H
@ -24,9 +24,6 @@ private:
unsigned char* readBuffer; unsigned char* readBuffer;
unsigned int readBufferLen; unsigned int readBufferLen;
cIptvProtocolIf* protocol; cIptvProtocolIf* protocol;
cString location;
int parameter;
int index;
public: public:
cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex); cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);