From cc9136df5686b89eb0e8a1914ce59ab3aabde969 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 8 Jan 2006 13:38:47 +0000
Subject: - Bounce to vdr-1.3.38 (Required)

---
 HISTORY         |  3 +++
 README          |  2 +-
 README.DE       |  2 +-
 control-image.c | 14 +++++++-------
 image.c         |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/HISTORY b/HISTORY
index acbd597..d88f98c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
 VDR Plugin 'image' Revision History
 -----------------------------------
 
+2006-01-08
+- Bounce to vdr-1.3.38 (Required)
+
 2006-01-06
 - add italian/dutch/portuguese/spanish translations via babelfish
 
diff --git a/README b/README
index f888465..986746d 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ Some files are from the mp3/MPlayer Plugin.	Thanks to Stefan H
 Required:
 -----------
 - fullfeatured dvb card
-- vdr 1.3.29+
+- vdr 1.3.38+
 - to compile plugin depends package libavcodec1-dev (tested with ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
 - to run your will need package netpbm and libavcodec1
 - netpbm 10.0+ (check for "anytopnm", if  it does not exist upgrade/install netpbm)
diff --git a/README.DE b/README.DE
index 190bda3..e0d4cd6 100644
--- a/README.DE
+++ b/README.DE
@@ -18,7 +18,7 @@ Einige Dateien stammen vom mp3/MPlayer Plugin, der danke geht an Stefan H
 Benötigt:
 -----------
 - Full-Featured DVB Karte 
-- vdr 1.3.29+ 
+- vdr 1.3.38+ 
 - das Plugin ist abhängig vom Paket libavcodec1-dev zu übersetzen, (getestet mit ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
 - und Paket netpbm sowie libavcodec1 zur Ausführung 
 - netpbm 10.0+ (prüfe ob das Tool "anytopnm" existiert)
diff --git a/control-image.c b/control-image.c
index 0182687..d8a4561 100644
--- a/control-image.c
+++ b/control-image.c
@@ -59,7 +59,7 @@ cImageControl::cImageControl(cSlideShow * pNewSlideShow)
  , m_pDisplayReplay(NULL)
 {
   // Notity all cStatusMonitor
-  cStatus::MsgReplaying(this, "[image]");
+  cStatus::MsgReplaying(this, "image", NULL, true );
   
   m_tStarted = time(NULL);
   
@@ -87,7 +87,7 @@ cImageControl::~cImageControl()
     delete m_pImageMenu;
   m_pImageMenu = NULL;
   // Notity cleanup all cStatusMonitor
-  cStatus::MsgReplaying(this, NULL);
+  cStatus::MsgReplaying(this, "image", NULL, false);
   // Hide OSD
   HideOSD();
   if(m_pDisplayReplay) {
@@ -152,15 +152,15 @@ void cImageControl::ShowStatusMsg()
   char* sz = 0;
   if(IsConvertRunning())  // Display that convert is running
   {
-    asprintf(&sz,"[image] %s",tr("Convert..."));
+    asprintf(&sz,"%s",tr("Convert..."));
   }
   else 
   {
     switch(m_ePlayMode)
     {
-      case ePlayModeNormal: asprintf(&sz,"[image] %s",FileName());break;
-      case ePlayModeJump:   asprintf(&sz,"[image] %s",tr("Select picture via key 1..9!"));break;
-      case ePlayModeZoom:   asprintf(&sz,"[image] %s %dx",tr("Zoom"),m_nZoomFactor);break;
+      case ePlayModeNormal: asprintf(&sz,"%s",FileName());break;
+      case ePlayModeJump:   asprintf(&sz,"%s",tr("Select picture via key 1..9!"));break;
+      case ePlayModeZoom:   asprintf(&sz,"%s %dx",tr("Zoom"),m_nZoomFactor);break;
     }
   }
   if(sz)
@@ -171,7 +171,7 @@ void cImageControl::ShowStatusMsg()
       if(m_szLastShowStatusMsg)
         free(m_szLastShowStatusMsg);
       m_szLastShowStatusMsg = sz;
-      cStatus::MsgReplaying(this, m_szLastShowStatusMsg);
+      cStatus::MsgReplaying(this, "image" , m_szLastShowStatusMsg, true );
     }
     else 
       free(sz);
diff --git a/image.c b/image.c
index 23b5f4e..c35d4bd 100644
--- a/image.c
+++ b/image.c
@@ -36,7 +36,7 @@
 #include "commands.h"
 #include "liboutput/encode.h"
 
-static const char *VERSION        = "0.2.4";
+static const char *VERSION        = "0.2.5";
 static const char *DESCRIPTION    = "A Image Viewer plugin";
 static const char *MAINMENUENTRY  = "Image";
 
-- 
cgit v1.2.3