[vdr] prefmenu-patch for vdr 1.1.14

["Olivier JACQUES" <jacquesolivier@hotmail.com>]

Hi list,

I adapted Maxime's plugin (prefermenu - 
http://m.guilbot.online.fr/prefermenu/) to run on VDR-1.1.14. I think it 
should also work with VDR-1.1.15 but I didn't tested it.
In addition, I added a small feature: when the menu is opened it is 
positionned on the channel which is the closest to the current channel.
Also, I wanted to thanks Maxime for his work: I really like the look of this 
plugin :)

Please refer to Maxime's web site for all details.

Olivier.


diff -U1 prefermenu-0.3.0/Makefile prefermenu-0.4.0/Makefile
--- prefermenu-0.3.0/Makefile	Thu Sep  5 18:25:36 2002
+++ prefermenu-0.4.0/Makefile	Sat Nov  2 15:08:33 2002
@@ -17,3 +17,9 @@

+ifdef NEWSTRUCT
+DVBDIR = ../../../../DVB/include
+DEFINES += -DNEWSTRUCT
+else
DVBDIR = ../../../../DVB/ost/include
+endif
+
VDRDIR = ../../..
@@ -36,3 +42,3 @@

-DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

diff -U1 prefermenu-0.3.0/prefermenu.c prefermenu-0.4.0/prefermenu.c
--- prefermenu-0.3.0/prefermenu.c	Sat Sep  7 18:54:11 2002
+++ prefermenu-0.4.0/prefermenu.c	Sat Nov  2 18:04:31 2002
@@ -172,3 +172,13 @@
	ReadPreferedChannels();
-	current=1;
+	//OJA current=1;
+	//Position next to the current channel
+	int mycurrent = cDevice::PrimaryDevice()->CurrentChannel();
+	int i=0;
+	printf("Mycurrent=%d\n", mycurrent);
+	while( (i < number) && (preferchannels[i] <= mycurrent) ) {
+		printf("pref[%d]=%d\n", i, preferchannels[i]);
+		i++;
+	}
+	current = i;
+
	DisplayMenu();
@@ -269,3 +279,3 @@
	if (preferchannels[current-1]!=0)
-	cDevice::PrimaryDevice()->SetChannel(Channels.GetByNumber(preferchannels[current-1]));
+	cDevice::PrimaryDevice()->SwitchChannel(Channels.GetByNumber(preferchannels[current-1]),true);
}
@@ -275,11 +285,11 @@
	int d = 10;
-	if (current>3) 	bitmap->DrawText(originx+d, 3+delta, 
Channels.GetChannelNameByNumber(preferchannels[current-4]), 
(eDvbColor)pal[6]);
-	if (current>2)  bitmap->DrawText(originx+d, 36+delta, 
Channels.GetChannelNameByNumber(preferchannels[current-3]), 
(eDvbColor)pal[6]);
-	if (current>1) 	bitmap->DrawText(originx+d, 69+delta, 
Channels.GetChannelNameByNumber(preferchannels[current-2]), 
(eDvbColor)pal[6]);
+	if (current>3) 	bitmap->DrawText(originx+d, 3+delta, 
(Channels.GetByNumber(preferchannels[current-4]))->Name(), 
(eDvbColor)pal[6]);
+	if (current>2)  bitmap->DrawText(originx+d, 36+delta, 
(Channels.GetByNumber(preferchannels[current-3]))->Name(), 
(eDvbColor)pal[6]);
+	if (current>1) 	bitmap->DrawText(originx+d, 69+delta, 
(Channels.GetByNumber(preferchannels[current-2]))->Name(), 
(eDvbColor)pal[6]);

-	bitmap->DrawText(originx+d, 102+delta, 
Channels.GetChannelNameByNumber(preferchannels[current-1]), 
(eDvbColor)pal[3]);
+	bitmap->DrawText(originx+d, 102+delta, 
(Channels.GetByNumber(preferchannels[current-1]))->Name(), 
(eDvbColor)pal[3]);

-    if (current<number) bitmap->DrawText(originx+d, 135+delta, 
Channels.GetChannelNameByNumber(preferchannels[current]), 
(eDvbColor)pal[6]);
-	if (current<number-1) 	bitmap->DrawText(originx+d, 168+delta, 
Channels.GetChannelNameByNumber(preferchannels[current+1]), 
(eDvbColor)pal[6]);
-	if (current<number-2) 	bitmap->DrawText(originx+d, 201+delta, 
Channels.GetChannelNameByNumber(preferchannels[current+2]), 
(eDvbColor)pal[6]);
+    if (current<number) bitmap->DrawText(originx+d, 135+delta, 
(Channels.GetByNumber(preferchannels[current]))->Name(), (eDvbColor)pal[6]);
+	if (current<number-1) 	bitmap->DrawText(originx+d, 168+delta, 
(Channels.GetByNumber(preferchannels[current+1]))->Name(), 
(eDvbColor)pal[6]);
+	if (current<number-2) 	bitmap->DrawText(originx+d, 201+delta, 
(Channels.GetByNumber(preferchannels[current+2]))->Name(), 
(eDvbColor)pal[6]);

@@ -353,7 +363,7 @@
void cPrefermenuThread::RemoveChannel() {
-	PreferedChannels.RemovePreferedChannel(preferchannels[current-1]);
+    PreferedChannels.RemovePreferedChannel(preferchannels[current-1]);
     ReadPreferedChannels();
-	current = 1;
- 	DrawMenu(0,0);
-	DisplayBitmap();
+    current = 1;
+    DrawMenu(0,0);
+    DisplayBitmap();
}
diff -U1 prefermenu-0.3.0/prefermenu.h prefermenu-0.4.0/prefermenu.h
--- prefermenu-0.3.0/prefermenu.h	Sat Sep  7 19:03:19 2002
+++ prefermenu-0.4.0/prefermenu.h	Sat Nov  2 18:21:29 2002
@@ -16,3 +16,3 @@

-static const char *VERSION        = "0.3.0";
+static const char *VERSION        = "0.4.0";
static const char *DESCRIPTION    = "Prefer Channel menu";
@@ -132,2 +132,2 @@

-cPreferedChannels PreferedChannels;
\ No newline at end of file
+cPreferedChannels PreferedChannels;
diff -U1 prefermenu-0.3.0/symbols.c prefermenu-0.4.0/symbols.c
--- prefermenu-0.3.0/symbols.c	Thu Sep  5 18:25:36 2002
+++ prefermenu-0.4.0/symbols.c	Sat Nov  2 18:02:20 2002
@@ -67,2 +67,3 @@
  },
-};
\ No newline at end of file
+};
+


_________________________________________________________________
MSN Messenger : discutez en direct avec vos amis ! 
http://www.msn.fr/msger/default.asp



-- 
Info:
To unsubscribe send a mail to listar@linuxtv.org with "unsubscribe vdr" as subject.