? DOWNLOADED_8_4_AM
? programs/menutest/Makefile
? programs/menutest/menutest
Index: libs/libmyth/lcddevice.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/lcddevice.cpp,v
retrieving revision 1.16
diff -b -u -2 -r1.16 lcddevice.cpp
--- libs/libmyth/lcddevice.cpp	3 Apr 2003 19:56:56 -0000	1.16
+++ libs/libmyth/lcddevice.cpp	4 Aug 2003 21:32:20 -0000
@@ -12,4 +12,7 @@
 #include "lcddevice.h"
 
+
+unsigned int LCD::leds=0;
+
 LCD::LCD()
 	:QObject()
@@ -74,4 +77,7 @@
 	{
 #ifdef LCD_DEVICE	
+#ifdef LCD_DEVICE_DEBUG
+	    cout << "lcddevice: Sending \"Hello\"" << endl ;
+#endif
 	    QTextStream os(socket);
 		socket->connectToHost(hostname, port);
@@ -123,4 +129,7 @@
 	else
 	{
+#ifdef LCD_DEVICE_DEBUG
+	    cout << "lcddevice: Buffering to Server (Not Connected): " << someText << endl ;
+#endif
 	    //  Buffer this up in the hope that
 	    //  the connection will open soon
@@ -241,4 +250,7 @@
 	int i;
 	
+#ifdef LCD_DEVICE_DEBUG
+	cout << "lcddevice: Connected" << endl ;
+#endif
 	connected = TRUE;
 	//
@@ -454,4 +466,5 @@
 {
 	sendToServer("screen_set Time priority 64");
+        sendToServer("screen_set Time backlight on");
 	timeTimer->start(500, FALSE);
 	outputTime();
@@ -550,4 +563,5 @@
 	QString aString;
 	sendToServer("screen_set Music priority 64");
+        sendToServer("screen_set Music backlight on");
 	musicTimer->start(100, FALSE);
 	aString = artist;
@@ -562,4 +576,5 @@
 	QString aString;
 	sendToServer("screen_set Channel priority 64");
+        sendToServer("screen_set Channel backlight on");
 	channelTimer->start(500, FALSE);
 	aString = channum;
@@ -582,4 +597,5 @@
 	QString aString;
 	sendToServer("screen_set Menu priority 16");
+        sendToServer("screen_set Menu backlight on");
 	popMenuTimer->start(5000, TRUE);
 	outputCenteredTopText("Menu", menu_title.left(lcdWidth));
@@ -731,4 +747,7 @@
 #ifdef LCD_DEVICE
 
+#ifdef LCD_DEVICE_DEBUG
+    cout << "lcddevice: shutdown()" << endl ;
+#endif
 	stopAll();
 
@@ -763,4 +782,29 @@
 #endif
     connected = false;
+}
+
+#define VERBOSE(args...) \
+/*if (print_verbose_messages)*/ \
+    cout << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") \
+         << " " << args << endl;
+
+void LCD::setLed( int LedId)
+{
+    QString aString;
+    leds |= 1<<LedId;
+    aString = QString("output %1").arg(leds);
+    VERBOSE(QString("sendToServer(%1)").arg(aString));
+    sendToServer(aString);
+    printf( aString);
+}
+
+void LCD::clearLed( int LedId)
+{
+    QString aString;
+    leds &= ~(1<<LedId);
+    aString = QString("output %1").arg(leds);
+    VERBOSE(QString("sendToServer(%1)").arg(aString));
+    sendToServer(aString);
+    printf( aString);
 }
 
Index: libs/libmyth/lcddevice.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/lcddevice.h,v
retrieving revision 1.9
diff -b -u -2 -r1.9 lcddevice.h
--- libs/libmyth/lcddevice.h	3 Apr 2003 15:25:32 -0000	1.9
+++ libs/libmyth/lcddevice.h	4 Aug 2003 21:32:21 -0000
@@ -124,4 +124,9 @@
         void    shutdown();             //  close communications
     
+		//
+		// Interface to the LEDs
+		//
+	void	setLed( int LedId);
+	void	clearLed( int LedId);
 
 	private slots:
@@ -182,4 +187,5 @@
 		QString send_buffer;
 
+		static unsigned int leds;		
 };
 
Index: libs/libmyth/mythcontext.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythcontext.cpp,v
retrieving revision 1.78
diff -b -u -2 -r1.78 mythcontext.cpp
--- libs/libmyth/mythcontext.cpp	28 Jul 2003 15:49:37 -0000	1.78
+++ libs/libmyth/mythcontext.cpp	4 Aug 2003 21:32:21 -0000
@@ -1040,4 +1040,14 @@
 }
 
+void MythContext::LCDsetLed( int LedId)
+{
+    lcd_device->setLed( LedId);
+}
+
+void MythContext::LCDclearLed( int LedId)
+{
+    lcd_device->clearLed( LedId);
+}
+
 void MythContext::LCDdestroy()
 {
Index: libs/libmyth/mythcontext.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythcontext.h,v
retrieving revision 1.89
diff -b -u -2 -r1.89 mythcontext.h
--- libs/libmyth/mythcontext.h	20 Jul 2003 02:29:41 -0000	1.89
+++ libs/libmyth/mythcontext.h	4 Aug 2003 21:32:22 -0000
@@ -141,7 +141,13 @@
     void LCDpopMenu(QString menu_choice, QString menu_title);
     void LCDdestroy();
+//<<<<<<< mythcontext.h
+    void LCDsetLed( int LedId);
+    void LCDclearLed( int LedId);
+	
+//=======
 
     bool TestPopupVersion(const QString &name, const QString &libversion,
                           const QString &pluginversion);	
+//>>>>>>> 1.84
   private slots:
     void readSocket();
Index: libs/libmythtv/tv_rec.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/tv_rec.cpp,v
retrieving revision 1.100
diff -b -u -2 -r1.100 tv_rec.cpp
--- libs/libmythtv/tv_rec.cpp	4 Aug 2003 02:06:23 -0000	1.100
+++ libs/libmythtv/tv_rec.cpp	4 Aug 2003 21:32:24 -0000
@@ -236,4 +236,7 @@
         changeState = true;
         retval = 1;
+	// sjf mods
+        gContext->LCDsetLed(curRecording->cardid-1);
+	// end sjf
     }
     else if (!cancelNextRecording)
@@ -272,4 +275,7 @@
             usleep(50);
     }
+    // sjf mods
+    gContext->LCDclearLed(curRecording->cardid-1);
+    // end sjf
 }
 
@@ -346,4 +352,7 @@
     curRecording->FinishedRecording(db_conn);
     pthread_mutex_unlock(&db_lock);
+    // sjf mods
+    gContext->LCDclearLed(curRecording->cardid-1);
+    // end sjf
 }
 
Index: programs/mythbackend/main.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythbackend/main.cpp,v
retrieving revision 1.34
diff -b -u -2 -r1.34 main.cpp
--- programs/mythbackend/main.cpp	16 Jul 2003 13:16:19 -0000	1.34
+++ programs/mythbackend/main.cpp	4 Aug 2003 21:32:24 -0000
@@ -269,4 +269,14 @@
     }
 
+    // begin sjf mods
+    QString lcd_host = gContext->GetSetting("LCDHost");
+    int lcd_port = gContext->GetNumSetting("LCDPort");
+    if (lcd_host.length() > 0 && lcd_port > 1024)
+    {
+        gContext->LCDconnectToHost(lcd_host, lcd_port);
+    }
+    // end sjf
+
+
     int port = gContext->GetNumSetting("BackendServerPort", 6543);
     int statusport = gContext->GetNumSetting("BackendStatusPort", 6544);
Index: programs/mythfrontend/mainmenu.xml
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/mainmenu.xml,v
retrieving revision 1.24
diff -b -u -2 -r1.24 mainmenu.xml
--- programs/mythfrontend/mainmenu.xml	18 Jul 2003 01:13:58 -0000	1.24
+++ programs/mythfrontend/mainmenu.xml	4 Aug 2003 21:32:24 -0000
@@ -8,4 +8,10 @@
 
    <button>
+     <type>MythTivo</type>
+     <text>MythTivo</text>
+     <action>EXEC mythtivo</action>
+   </button>
+
+   <button>
      <type>MUSIC</type>
      <text>Music</text>
Index: programs/mythlcd/mythlcd.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythlcd/mythlcd.cpp,v
retrieving revision 1.5
diff -b -u -2 -r1.5 mythlcd.cpp
--- programs/mythlcd/mythlcd.cpp	16 Feb 2003 02:19:32 -0000	1.5
+++ programs/mythlcd/mythlcd.cpp	4 Aug 2003 21:32:24 -0000
@@ -13,4 +13,5 @@
 #include "mythlcd.h"
 #include "libmyth/mythcontext.h"
+#include "lcddevice.h"
 
 MythLCD::MythLCD(QWidget *parent, const char *name )
@@ -95,8 +96,11 @@
 	gContext->LCDswitchToTime();
 
+	gContext->LCDsetLed(0);
 }
 
 void MythLCD::doChannel()
 {
+	gContext->LCDsetLed(1);
+
 	fakeMusicTimer->stop();
 	switch(rand() % 5)
@@ -133,4 +137,7 @@
 void MythLCD::doMusic()
 {
+	gContext->LCDclearLed(0);
+	gContext->LCDclearLed(1);
+
 	switch(rand() % 5)
 	{
Index: themes/blue/theme.xml
===================================================================
RCS file: /var/lib/mythcvs/mythtv/themes/blue/theme.xml,v
retrieving revision 1.9
diff -b -u -2 -r1.9 theme.xml
--- themes/blue/theme.xml	18 Jul 2003 01:13:58 -0000	1.9
+++ themes/blue/theme.xml	4 Aug 2003 21:32:25 -0000
@@ -49,4 +49,9 @@
   </buttondef>
 
+  <buttondef name="MythTivo">
+    <image>tivo.png</image>
+    <offset>55,25</offset>
+  </buttondef>
+
   <buttondef name="MUSIC">
     <image>cd.png</image>