r4397 - in vdr/vdr-plugin-alcd/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-04-25 21:51:05 +0000 (Wed, 25 Apr 2007)
New Revision: 4397

Added:
   vdr/vdr-plugin-alcd/trunk/debian/patches/02_vdr-1.4.2-volume-fix.dpatch
Modified:
   vdr/vdr-plugin-alcd/trunk/debian/changelog
   vdr/vdr-plugin-alcd/trunk/debian/patches/00list
Log:
* Added 02_vdr-1.4.2-volume-fix.dpatch to fix problems iwth teh volume bar
  on VDR >= 1.4.2

Modified: vdr/vdr-plugin-alcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/changelog	2007-04-25 21:33:36 UTC (rev 4396)
+++ vdr/vdr-plugin-alcd/trunk/debian/changelog	2007-04-25 21:51:05 UTC (rev 4397)
@@ -1,3 +1,10 @@
+vdr-plugin-alcd (1.2.1-2) unstable; urgency=low
+
+  * Added 02_vdr-1.4.2-volume-fix.dpatch to fix problems iwth teh volume bar
+    on VDR >= 1.4.2
+
+ -- Tobias Grimm <tg at e-tobi.net>  Wed, 25 Apr 2007 23:50:51 +0200
+
 vdr-plugin-alcd (1.2.1-1) experimental; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-alcd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/patches/00list	2007-04-25 21:33:36 UTC (rev 4396)
+++ vdr/vdr-plugin-alcd/trunk/debian/patches/00list	2007-04-25 21:51:05 UTC (rev 4397)
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 01_script-paths
+02_vdr-1.4.2-volume-fix

Added: vdr/vdr-plugin-alcd/trunk/debian/patches/02_vdr-1.4.2-volume-fix.dpatch
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/patches/02_vdr-1.4.2-volume-fix.dpatch	2007-04-25 21:33:36 UTC (rev 4396)
+++ vdr/vdr-plugin-alcd/trunk/debian/patches/02_vdr-1.4.2-volume-fix.dpatch	2007-04-25 21:51:05 UTC (rev 4397)
@@ -0,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_vdr-1.4.2-volume-fix.dpatch by arghgra @ vdr-portal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes volume bart for VDR >= 1.4.2.
+
+ at DPATCH@
+diff -urNad vdr-plugin-alcd-1.2.1~/alcd-thread.c vdr-plugin-alcd-1.2.1/alcd-thread.c
+--- vdr-plugin-alcd-1.2.1~/alcd-thread.c	2006-11-01 01:03:02.000000000 +0100
++++ vdr-plugin-alcd-1.2.1/alcd-thread.c	2007-04-25 23:39:38.000000000 +0200
+@@ -49,6 +49,7 @@
+    stop = false;
+    running = true;
+    displayMode = MOD_TV;
++   mLastVolume = 0;
+ 
+    infoTimer = 0;
+    lockTimer = 0;
+@@ -537,18 +538,23 @@
+ /////////////////////////////////////////////////////////
+ // Set Volume
+ 
+-void cLCD::SetVolume( int volume, bool muted )
++void cLCD::SetVolume( int volume, bool Absolute )
+ {
+ #ifdef DEBUG
+    isyslog( "In SetVol" );
+ #endif
++   if ( Absolute )
++      mLastVolume = volume;
++   else
++      mLastVolume += volume;
++
+    if( ! VDR_LOCKED ) {
+       cMutexLock lock( &_mutex );
+-      int vol = ( volume * 18 ) / 255;
++      int vol = ( mLastVolume * 18 ) / 255;
+ 
+       myLCD->FormatString( szMsgText1, ( char * )tr( "Volume" ), BUFSIZE, false, true );
+       szMsgText2[0] = '[';
+-      if( muted )
++      if (( volume == 0 ) && ( Absolute ))
+          strcpy( szMsgText2 + 1, "    -- MUTE --    " );
+       else {
+          memset( szMsgText2 + 1, '#', vol );
+diff -urNad vdr-plugin-alcd-1.2.1~/alcd-thread.h vdr-plugin-alcd-1.2.1/alcd-thread.h
+--- vdr-plugin-alcd-1.2.1~/alcd-thread.h	2006-10-31 13:29:33.000000000 +0100
++++ vdr-plugin-alcd-1.2.1/alcd-thread.h	2007-04-25 23:39:38.000000000 +0200
+@@ -54,6 +54,7 @@
+    bool stop;
+    bool running;
+    int lLED1, lLED2, lLEDPower;
++   int mLastVolume;
+ 
+    Recordings _recordings;
+    cControl *PlayControl;
+@@ -74,7 +75,7 @@
+    virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+    virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
+    virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
+-   virtual void SetVolume(int Volume, bool mute);
++   virtual void SetVolume(int Volume, bool Absolute);
+    virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
+    virtual void OsdCurrentItem(const char *Text);
+    virtual void OsdChannel(const char *Text);