0001-Update-for-VDR-2.6_kamel5

Author: Markus Ehrnsperger

Makefile

@@ -16,7 +16,7 @@ FFMDIR = /usr/include
 #WITH_TOUCH = 1
 
 # like the X renderer to display directly on local xorg (grpahtft-fe not needed) 
-WITH_X = 1
+#WITH_X = 1
 
 # compile the graphtft-fe an the therefor tcp communication
 WITH_TCPCOM = 1
@@ -112,7 +112,7 @@ endif
 DEFINES += -D__STL_CONFIG_H
 
 LIBS += $(shell pkg-config libexif --libs 2>/dev/null)
-LIBS += $(shell imlib2-config --libs)
+LIBS += $(shell pkg-config imlib2 --libs 2>/dev/null)
 LIBS += $(shell pkg-config libgtop-2.0 --libs 2>/dev/null)
 
 ifdef WITH_TCPCOM

common.c

@@ -517,7 +517,7 @@ const char* Str::toCase(Case cs, char* str)
 
    for (int ps = 0; ps < lenSrc; ps += csSrc)
    {
-      csSrc = max(mblen(&s[ps], lenSrc-ps), 1);
+      csSrc = std::max(mblen(&s[ps], lenSrc-ps), 1);
 
       if (csSrc == 1)
          s[ps] = cs == cUpper ? toupper(s[ps]) : tolower(s[ps]);
@@ -697,7 +697,7 @@ int clen(const char* s)
    int len = 0;
 
    for (int bp = 0; bp < blen; bp += cs, len++)
-      cs = max(mblen(&s[bp], blen-bp), 1);
+      cs = std::max(mblen(&s[bp], blen-bp), 1);
 
    return len;
 }

common.h

@@ -4,7 +4,7 @@
  *  common.h - A plugin for the Video Disk Recorder
  *
  *  (c) 2004 Lars Tegeler, Sascha Volkenandt
- *  (c) 2006-2014 Jörg Wendel
+ *  (c) 2006-2014 J�rg Wendel
  *
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
@@ -23,17 +23,14 @@
 #include <string.h>
 #include <iconv.h>
 #include <stdint.h>
+#include <time.h>
 
 class MemoryStruct;
 
 //***************************************************************************
 // 
 //***************************************************************************
 
-// since we compile with __STL_CONFIG_H
-
-template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
-template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
 
 using std::string;
 

comthread.c

@@ -163,7 +163,7 @@ void ComThread::Action()
       for (unsigned int i = 0; i < clients.size(); i++)
       {
          FD_SET(clients[i].channel->getHandle(), &readSet);
-         maxFD = max(maxFD, clients[i].channel->getHandle());
+         maxFD = std::max(maxFD, clients[i].channel->getHandle());
       }
 
       _mutex.Unlock();

display.c

@@ -818,6 +818,7 @@ void cGraphTFTDisplay::updateTimers()
    _timers.sort();
 
    triggerTimerUpdate = no;
+
    updateGroup(groupRecording);
    broadcast();
 }
@@ -861,9 +862,6 @@ void cGraphTFTDisplay::updateChannel()
 
 void cGraphTFTDisplay::finalizeItemList()
 {
-   needLock = yes;
-   cMutexLock lock(&_mutex);
-
 #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
    const cChannels* channels = 0;
    const cRecordings* recordings = 0;
@@ -891,6 +889,8 @@ void cGraphTFTDisplay::finalizeItemList()
    cRecordings* recordings = &Recordings;
 #endif
 
+   cMutexLock lock(&_mutex);
+   needLock = yes;
    for (string::size_type i = 0; i < _menu.items.size(); i++)
    {
       if (!_menu.items[i].event.isEmpty())
@@ -1526,10 +1526,9 @@ void cGraphTFTDisplay::updateProgram()
 
    if (channel)
    {
-      tell(5, "updateProgram for channel '%s'", channel->Name());
-
-      needLock = yes;
+      tell(1, "updateProgram for channel '%s'", channel->Name());
       cMutexLock lock(&_mutex);
+      needLock = yes;
 
 //       const cEvent* present = _presentEvent;
 //       const cEvent* following = _followingEvent;

display.h

@@ -22,11 +22,6 @@
 #include <vector>
 #include <algorithm>
 
-#include <vdr/tools.h>
-#include <vdr/thread.h>
-#include <vdr/status.h>
-#include <vdr/skins.h>
-
 #include <common.h>
 #include <comthread.h>
 #include <touchthread.h>
@@ -37,6 +32,11 @@
 #  include "../vdr-plugin-epg2vdr/service.h"
 #endif
 
+#include <vdr/tools.h>
+#include <vdr/thread.h>
+#include <vdr/status.h>
+#include <vdr/skins.h>
+
 using std::string;
 using std::vector;
 
@@ -125,7 +125,7 @@ class cEventCopy
             initialized = no;
             return;
          }
-            
+
          setEventID(event->EventID());
          setChannelID(event->ChannelID());
 

dspitems.c

@@ -626,7 +626,7 @@ int cDisplayItem::drawText(const char* text, int y,
    int lines = height / lineHeight > 0 ? height / lineHeight : 1;
 
    if (_lines > 0)
-      lines = min(lines, _lines);
+      lines = std::min(lines, _lines);
 
    int visibleWidth = width*lines;
 
@@ -727,7 +727,7 @@ int cDisplayItem::drawText(const char* text, int y,
       for (ps = 0; ps < blen; ps += cs)
       {
          i++;
-         cs = max(mblen(&text[ps], blen-ps), 1);
+         cs = std::max(mblen(&text[ps], blen-ps), 1);
 
          if (i >= marquee_idx)
             break;
@@ -1160,7 +1160,7 @@ int cDisplayText::draw()
    {
       neededLines = render->lineCount(p.c_str(), _font.c_str(), _size, width);
       lastHeight = neededLines * lineHeight;
-      lastHeight = min(lastHeight, Height());                    // respect configured max height
+      lastHeight = std::min(lastHeight, Height());                    // respect configured max height
    }
 
    tell(3, "Dimension of '%s' %d/%d now %d/%d; position is %d/%d, need %d lines [%d,%d,%d]",
@@ -1928,7 +1928,7 @@ int cDisplayMenu::draw()
    vdrStatus->_menu.lineHeightSelected = lineHeightSelect;
 
    if (vdrStatus->_menu.topRow < 0)
-      vdrStatus->_menu.topRow = max(0, vdrStatus->_menu.currentRow - count/2);   // initial
+      vdrStatus->_menu.topRow = std::max(0, vdrStatus->_menu.currentRow - count/2);   // initial
    else if (vdrStatus->_menu.currentRow == vdrStatus->_menu.topRow-1)
       vdrStatus->_menu.topRow = vdrStatus->_menu.currentRow;                     // up
    else if (vdrStatus->_menu.currentRow == vdrStatus->_menu.topRow+count)
@@ -1962,7 +1962,7 @@ int cDisplayMenu::draw()
 
    // loop over visible rows ...
 
-   for (int i = vdrStatus->_menu.topRow; i < min((int)vdrStatus->_menu.items.size(),
+   for (int i = vdrStatus->_menu.topRow; i < std::min((int)vdrStatus->_menu.items.size(),
          vdrStatus->_menu.topRow + count); ++i)
    {
       cDisplayItem* p = i == vdrStatus->_menu.currentRow ? selectedItem : this;
@@ -2103,7 +2103,7 @@ int cDisplayMenuColumn::draw()
    _menu->lineHeightSelected = lineHeightSelect;
 
    if (_menu->topRow < 0)
-      _menu->topRow = max(0, _menu->currentRow - count/2);     // initial
+      _menu->topRow = std::max(0, _menu->currentRow - count/2);     // initial
    else if (_menu->currentRow == _menu->topRow-1)
       _menu->topRow = _menu->currentRow;                       // up
    else if (_menu->currentRow == _menu->topRow+count)
@@ -2128,7 +2128,7 @@ int cDisplayMenuColumn::draw()
 
    // paint the visible rows for this column
 
-   for (int i = _menu->topRow; i < min((int)_menu->items.size(), _menu->topRow + count); ++i)
+   for (int i = _menu->topRow; i < std::min((int)_menu->items.size(), _menu->topRow + count); ++i)
    {
       cDisplayItem* p = this;
 
@@ -2362,7 +2362,7 @@ int cDisplayMenuEventColumn::draw()
    _menu->lineHeightSelected = lineHeightSelect;
 
    if (_menu->topRow < 0)
-      _menu->topRow = max(0, _menu->currentRow - count/2);     // initial
+      _menu->topRow = std::max(0, _menu->currentRow - count/2);     // initial
    else if (_menu->currentRow == _menu->topRow-1)
       _menu->topRow = _menu->currentRow;                       // up
    else if (_menu->currentRow == _menu->topRow+count)
@@ -2387,7 +2387,7 @@ int cDisplayMenuEventColumn::draw()
 
    // paint the visible rows for this column
 
-   for (int i = _menu->topRow; vdrStatus->_eventsReady && i < min((int)_menu->items.size(), _menu->topRow + count); ++i)
+   for (int i = _menu->topRow; vdrStatus->_eventsReady && i < std::min((int)_menu->items.size(), _menu->topRow + count); ++i)
    {
       if (i == na)
          tell(0, "XXXXXXXXXXXXXXXXXXXXXXXXX");
@@ -2492,7 +2492,7 @@ int cDisplayMenuEventColumn::draw()
          if (evaluate(text, p->Text().c_str()) != success)
                text = "";
 
-         tell(5, "draw '%s'", text.c_str());
+         tell(1, "--> draw '%s'", text.c_str());
 
          if (!p->Line())
             p->drawText(text.c_str(),

graphtft-fe/thread.cc

@@ -57,7 +57,7 @@ cCondWait::~cCondWait()
 void cCondWait::SleepMs(int TimeoutMs)
 {
   cCondWait w;
-  w.Wait(max(TimeoutMs, 3)); // making sure the time is >2ms to avoid a possible busy wait
+  w.Wait(std::max(TimeoutMs, 3)); // making sure the time is >2ms to avoid a possible busy wait
 }
 
 bool cCondWait::Wait(int TimeoutMs)

graphtftng.c

@@ -11,14 +11,15 @@
  *
  **/
 
-#include <vdr/config.h>
 #include <theme.h>
 #include <getopt.h>
 
 #include <service.h>
 #include <graphtftng.h>
 #include <span.h>
 
+#include <vdr/config.h>
+
 //***************************************************************************
 // cGraphTFTMenu
 //***************************************************************************
@@ -266,6 +267,7 @@ bool cPluginGraphTFT::Start()
    if (display->init(device, port, startDetached) != success)
    {
       tell(0, "Error: Initializing failed, aborting!");
+      dsyslog ("GraphTFTNG: Initializing failed, aborting!");
 
       return 0;
    }

imlibrenderer/imlibrenderer.c

@@ -28,6 +28,7 @@
 
 #include <jpeglib.h>
 
+//#include "Imlib2.h"
 #include "imlibrenderer.h"
 #include "theme.h"
 #include "common.h"

imlibrenderer/imlibrenderer.h

@@ -14,14 +14,13 @@
 #ifndef __GTFT_IMLIBRENDERER_HPP
 #define __GTFT_IMLIBRENDERER_HPP
 
+#include <Imlib2.h>
 #include "renderer.h"
 
 #ifndef WITH_X
 #  define X_DISPLAY_MISSING
 #endif
 
-#include <Imlib2.h>
-
 #undef Status
 
 //***************************************************************************

scraper2vdr.c

@@ -14,11 +14,11 @@
 // Includes
 //***************************************************************************
 
-#include <vdr/plugin.h>
-
 #include <common.h>
 #include <scraper2vdr.h>
 
+#include <vdr/plugin.h>
+
 //***************************************************************************
 // Get Scraper Plugin
 //***************************************************************************
@@ -73,7 +73,7 @@ int getScraperMediaPath(const cEventCopy* event, const cRecording* recording,
 
       if (!schedules ||
           !(s = (cSchedule*)schedules->GetSchedule(event->ChannelID())) ||
-          !(evt = s->GetEvent(event->EventID())))
+          !(evt = s->GetEventById(event->EventID())))
       {
          tell(0, "Error, can't get lock on schedules or cant find event, aborting!");
          return fail;

status.c

@@ -344,7 +344,7 @@ void cGraphTFTDisplay::OsdEventItem(const cEvent* Event, const char* Text,
    {
       tell(3, "OsdEventItem() Force update due to index/count (%d/%d)", Index, Count);
 
-      triggerFinalizeItemList = yes;
+  //    triggerFinalizeItemList = yes;
       updateGroup(groupMenu);
       broadcast();
    }

theme.c

@@ -162,7 +162,7 @@ int VariableProvider::evaluate(string& buf, const char* var)
       // found expression
 
       e--;
-      len = min((int)(e-s), 1000);
+      len = std::min((int)(e-s), 1000);
 
       if (len < 1)
       {