[G15daemon-commits] SF.net SVN: g15daemon: [452] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 452
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=452&view=rev
Author:   mlampard
Date:     2008-01-24 21:34:31 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: restore client ability to change backlight state for individual screens.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/g15daemon/main.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-25 04:45:04 UTC (rev 451)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-25 05:34:31 UTC (rev 452)
@@ -165,3 +165,4 @@
 - Optimisation: The delay between screen updates is no longer required. remove.
 SVN:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
+- BugFix: restore client ability to change backlight state.

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2008-01-25 04:45:04 UTC (rev 451)
+++ trunk/g15daemon-wip/g15daemon/main.c	2008-01-25 05:34:31 UTC (rev 452)
@@ -226,7 +226,7 @@
     /* unsigned int fps = 0; */
     lcd_t *displaying = masterlist->tail->lcd;
     memset(displaying->buf,0,1024);
-    
+    static int prev_state=0;
     g15daemon_sleep(2);
 
     while (!leaving) {
@@ -246,15 +246,18 @@
         uf_write_buf_to_g15(displaying);
         g15daemon_log(LOG_DEBUG,"LCD Update Complete");
         
+        if(prev_state!=displaying->backlight_state) {
+              prev_state=displaying->backlight_state;
+              pthread_mutex_lock(&g15lib_mutex);
+              setLCDBrightness(displaying->backlight_state);
+              pthread_mutex_unlock(&g15lib_mutex);
+        }
+
         if(displaying->state_changed){
             pthread_mutex_lock(&g15lib_mutex);
             setLCDContrast(displaying->contrast_state);
             if(displaying->masterlist->remote_keyhandler_sock==0) // only allow mled control if the macro recorder isnt running
               setLEDs(displaying->mkey_state);
-            if(masterlist->kb_backlight_state)
-              setLCDBrightness(displaying->backlight_state);
-            else
-              setLCDBrightness(masterlist->kb_backlight_state);
             pthread_mutex_unlock(&g15lib_mutex);
             displaying->state_changed = 0;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.