Changeset 20406

Timestamp:

03/08/13 18:52:13 (11 years ago)

Author:

gost

Message:

[lcdsamsung] extension for analog clock

File:

• titan/plugins/lcdsamsung/lcdsamsung.c (modified) (11 diffs)

titan/plugins/lcdsamsung/lcdsamsung.c

@@ -10 +10 @@
 
 int pluginaktiv = 0;
-int pluginversion = PLUGINVERSION;
+//int pluginversion = PLUGINVERSION;
+int pluginversion = 999999;
 
 struct stimerthread* LCD_Samsung1thread = NULL;
@@ -94 +95 @@
         struct skin* akttime_Standby = NULL;
         
+        struct skin* n_stunde = NULL;
+        struct skin* n_minute = NULL;
+        
         struct skin* sday0_t = NULL;
         struct skin* sday0_i = NULL;
@@ -109 +113 @@
         
         char* tmpstr = NULL, *tmpstr2 = NULL, *tmpstr3 = NULL, *timemerk = NULL, *sendermerk = NULL, *recmerk = NULL;
+        char* pichr = NULL, *picmin = NULL, *pichr_standby = NULL, *picmin_standby = NULL;
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -150 +155 @@
                 day3_d = getscreennode(LCD_Samsung1, "day3_d");
                 akttime = getscreennode(LCD_Samsung1, "akttime");
+                n_stunde =  getscreennode(LCD_Samsung1, "stunde");
+                n_minute =  getscreennode(LCD_Samsung1, "minute");
                 if(file_exist("/tmp/lcdweather"))
                         system("rm /tmp/lcdweather");
@@ -176 +183 @@
                         LCD_Samsung1 = getscreen("LCD_spf87");  
                 akttime = getscreennode(LCD_Samsung1, "akttime");
+                n_stunde =  getscreennode(LCD_Samsung1, "stunde");
+                if(n_stunde != NULL)
+                        pichr = ostrcat(n_stunde->pic, "", 0, 0);
+                n_minute =  getscreennode(LCD_Samsung1, "minute");
+                if(n_minute != NULL)
+                        picmin = ostrcat(n_minute->pic, "", 0, 0);
         }
         
@@ -264 +277 @@
                 sday3_i = getscreennode(LCD_Standby, "day3_i");
                 sday3_d = getscreennode(LCD_Standby, "day3_d");
+                
+                struct skin* n_stunde_standby =  getscreennode(LCD_Standby, "stunde");
+                if(n_stunde_standby != NULL)
+                        pichr_standby = ostrcat(n_stunde_standby->pic, "", 0, 0);
+                struct skin* n_minute_standby =  getscreennode(LCD_Standby, "minute");
+                if(n_minute_standby != NULL)
+                        picmin_standby = ostrcat(n_minute_standby->pic, "", 0, 0);
+
         } 
         
@@ -273 +294 @@
         int playertype = 0;
         int loopcount = 0;
+        
+        int hr = 0, min = 0;
         
         if(firststart == 1)
@@ -284 +307 @@
 
                 tmpstr = gettime(NULL, "%H:%M");
+                hr = atoi(gettime(NULL, "%H"));
+                min = atoi(gettime(NULL, "%M"));
                 
                 // TV Programm läuft
@@ -515 +540 @@
                                                 if(standby == 0)
                                                 {
-                                                        changetext(akttime, tmpstr);
+                                                        if(akttime != NULL)
+                                                                changetext(akttime, tmpstr);
+                                                        if(n_minute != NULL)
+                                                        {
+                                                                free(tmpstr);tmpstr=NULL;
+                                                                tmpstr = ostrcat("min_",gettime(NULL, "%M"), 0, 0);
+                                                                free(n_minute->pic);
+                                                                n_minute->pic = string_replace("min_mm", tmpstr, picmin, 0);
+                                                                free(tmpstr);tmpstr=NULL;
+                                                        }
+                                                        if(n_stunde != NULL)
+                                                        {
+                                                                free(tmpstr);tmpstr=NULL;
+                                                                if(hr > 12)
+                                                                        hr = hr - 12;
+                                                                if(hr < 10)
+                                                                        tmpstr = ostrcat("hr_0",oitoa(hr), 0, 1);
+                                                                else
+                                                                        tmpstr = ostrcat("hr_",oitoa(hr), 0, 1);
+                                                                if(min < 15)
+                                                                        tmpstr = ostrcat(tmpstr,"00", 0, 0);
+                                                                else if(min < 30)
+                                                                        tmpstr = ostrcat(tmpstr,"15", 0, 0);
+                                                                else if(min < 45)
+                                                                        tmpstr = ostrcat(tmpstr,"30", 0, 0);
+                                                                else if(min < 59)
+                                                                 tmpstr = ostrcat(tmpstr,"45", 0, 0);
+                                                                free(n_stunde->pic);
+                                                                n_stunde->pic = string_replace("hr_hhmm", tmpstr, pichr, 0);
+                                                                free(tmpstr);tmpstr=NULL;
+                                                        }       
+                                                                
+                                                                        
                                                         if(drawscreen(LCD_Samsung1, 0, 0) == -2)
                                                                 printf("nicht genug Speicher fuer drawscreen\n");
@@ -521 +578 @@
                                                 else if(standby == 2)
                                                 {
-                                                        changetext(akttime_Standby, tmpstr); 
+                                                        if(akttime_Standby != NULL)
+                                                                changetext(akttime_Standby, tmpstr); 
                                                         drawscreen(LCD_Standby, 0, 0); 
                                                         put = 0;
@@ -605 +663 @@
         free(recmerk);recmerk=NULL;
         free(startlcd);startlcd=NULL;
+        free(pichr);pichr=NULL;
+        free(picmin);picmin=NULL;
+        free(pichr_standby);pichr=NULL;
+        free(picmin_standby);picmin=NULL;
         addconfig("lcd_samsung_plugin_running", "no");
         LCD_Samsung1thread = NULL;