Changeset 42551
- Timestamp:
- 07/21/18 19:51:47 (6 years ago)
- Location:
- titan
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/lcdsamsung/lcdsamsung.c
r41843 r42551 79 79 } 80 80 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "none") == 0) 81 { 82 startlcd = createpluginpath("/lcdsamsung/start.sh", 0); 83 startlcd = ostrcat(startlcd, " 99", 1, 0); 84 } 85 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 81 86 { 82 87 startlcd = createpluginpath("/lcdsamsung/start.sh", 0); … … 208 213 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "spf85p") == 0) 209 214 LCD_Samsung1 = getscreen("LCD_spf85_Wetter"); 215 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 216 LCD_Samsung1 = getscreen("LCD_d320_Wetter"); 210 217 else 211 218 LCD_Samsung1 = getscreen("LCD_spf87_Wetter"); … … 275 282 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "spf85p") == 0) 276 283 LCD_Samsung1 = getscreen("LCD_spf85"); 284 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 285 LCD_Samsung1 = getscreen("LCD_d320"); 277 286 else 278 287 LCD_Samsung1 = getscreen("LCD_spf87"); … … 315 324 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "spf85p") == 0) 316 325 LCD_Play = getscreen("LCD_spf85_Play"); 326 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 327 LCD_Play = getscreen("LCD_d320_Play"); 317 328 else 318 329 LCD_Play = getscreen("LCD_spf87_Play"); … … 342 353 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "spf85p") == 0) 343 354 LCD_Music = getscreen("LCD_spf85_Music"); 355 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 356 LCD_Music = getscreen("LCD_d320_Music"); 344 357 else 345 358 LCD_Music = getscreen("LCD_spf87_Music"); … … 409 422 startlcd = ostrcat(startlcd, " 99", 1, 0); 410 423 } 424 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 425 { 426 startlcd = createpluginpath("/lcdsamsung/start.sh", 0); 427 startlcd = ostrcat(startlcd, " 99", 1, 0); 428 } 411 429 else 412 430 { … … 436 454 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "spf85p") == 0) 437 455 LCD_Standby = getscreen("LCD_spf85_Standby"); 456 else if(ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320") == 0) 457 LCD_Standby = getscreen("LCD_d320_Standby"); 438 458 else 439 459 LCD_Standby = getscreen("LCD_spf87_Standby"); … … 1190 1210 addchoicebox(lcdtype, "spf107h", _("SPF-107H")); 1191 1211 addchoicebox(lcdtype, "none", _("tiMote")); 1212 addchoicebox(lcdtype, "d320", _("Dummy-320")); 1192 1213 setchoiceboxselection(lcdtype, getconfig("lcd_samsung_plugin_type", NULL)); 1193 1214 -
titan/skins/lcdsamsung/skin.xml
r38584 r42551 486 486 </screen> 487 487 488 488 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_d320 posx=0 posy=0 width=320 height=240 bgcol=000000> 489 <node fontsize=40 halign=center text="" func=getaktchannelname name=channelname posx=5 posy=5 width=310 height=40 fontcol=fontcol/> 490 <node func=getpicon posx=110 posy=50 width=100 height=60/> 491 <node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=20 posx=10 posy=115 width=300 height=30 fontcol=fontcol/> 492 <node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=bordercol borderradius=5 name=epgline posy=145 posx=center width=290 height=20/> 493 <node halign=center text="" name=akttime fontsize=50 posx=center posy=170 width=320 height=50/> 494 <node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=220 width=100 height=20/> 495 </screen> 496 497 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_d320_Wetter posx=0 posy=0 width=320 height=240 bgcol=000000> 498 <node fontsize=50 halign=center text="" func=getaktchannelname name=channelname posx=5 posy=3 width=310 height=50 fontcol=fontcol/> 499 <node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=20 posx=10 posy=60 width=300 height=20 fontcol=fontcol/> 500 <node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=bordercol borderradius=5 name=epgline posy=85 posx=center width=290 height=15/> 501 <node halign=center text="" name=akttime fontsize=50 posx=center posy=100 width=320 height=50/> 502 <node halign=center text="0 C" name=day0_t fontsize=20 posx=10 posy=160 width=60 height=20/> 503 <node halign=center text="0 C" name=day1_t fontsize=20 posx=100 posy=160 width=60 height=20/> 504 <node halign=center text="0 C" name=day2_t fontsize=20 posx=175 posy=160 width=60 height=20/> 505 <node halign=center text="0 C" name=day3_t fontsize=20 posx=250 posy=160 width=60 height=20/> 506 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day0_i posx=10 posy=180 width=60 height=60/> 507 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day1_i posx=100 posy=180 width=60 height=60/> 508 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day2_i posx=175 posy=180 width=60 height=60/> 509 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day3_i posx=250 posy=180 width=60 height=60/> 510 <node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=220 width=100 height=20/> 511 </screen> 512 513 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_d320_Standby posx=0 posy=0 width=320 height=240 bgcol=000000> 514 <node halign=center text="" name=akttime fontsize=100 posx=center posy=70 width=320 height=100/> 515 <node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=220 width=100 height=20/> 516 </screen> 517 518 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_d320_Play posx=0 posy=0 width=320 height=240 bgcol=000000> 519 #<node pic=%pluginpath%/lcdsamsung/mc.png type=textbox wrap=yes fontsize=30 halign=center text="" name=title posx=0 posy=0 width=320 height=240 fontcol=fontcol/> 520 <node type=textbox wrap=yes fontsize=30 halign=center text="" name=title1 posx=5 posy=10 width=310 height=90 fontcol=fontcol/> 521 <node text="---" name=len posx=center posy=110 width=100 height=20 fontcol=fontcol/> 522 <node halign=center bordersize=2 progresscol=CD661D name=progress bgcol=white halign=left bordercol=bordercol borderradius=5 posy=135 posx=center width=290 height=20/> 523 <node text="---" halign=right name=reverse posx=215 posy=160 width=100 height=20 fontcol=fontcol/> 524 <node text="---" name=pos posx=10 posy=160 width=100 height=20 fontcol=fontcol/> 525 <node halign=center text="" name=akttime fontsize=50 posx=center posy=180 width=320 height=50/> 526 </screen> 527 528 529 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_d320_Music posx=0 posy=0 width=320 height=240 bgcol=000000> 530 <node pic=%pluginpath%/lcdsamsung/mc.png type=textbox wrap=yes fontsize=30 halign=center text="" name=title posx=0 posy=0 width=320 height=240 fontcol=fontcol/> 531 <node type=textbox wrap=yes fontsize=30 halign=center text="Auswahl" name=title posx=5 posy=40 width=310 height=90 fontcol=fontcol/> 532 <node halign=center text="" name=akttime fontsize=50 posx=center posy=150 width=320 height=50/> 533 </screen> -
titan/titan/skin.h
r41873 r42551 4198 4198 lcdskinfb = addfb("lcdskinfb", 999, 1024, 600, 4, -1, newskinfb, 4 * 1024 * 600, 0); 4199 4199 } 4200 else if(node->name != NULL && ostrstr(node->name, "LCD_d320") != NULL) { 4201 unsigned char *newskinfb = calloc(1, 4 * 320 * 240); 4202 if(newskinfb == NULL) 4203 { 4204 if(flag == 0 || flag == 4) 4205 m_unlock(&status.drawingmutex, 0); 4206 m_unlock(&status.oledmutex, 25); 4207 return -2; 4208 } 4209 lcdskinfb = addfb("lcdskinfb", 999, 320, 240, 4, -1, newskinfb, 4 * 320 * 240, 0); 4210 } 4200 4211 else { 4201 4212 unsigned char *newskinfb = calloc(1, 4 * 320 * 240); … … 4224 4235 else if(node->name != NULL && ostrstr(node->name, "LCD_spf105") != NULL) 4225 4236 lcdskinfb = oledaddfb(1024, 600); 4237 else if(node->name != NULL && ostrstr(node->name, "LCD_d320") != NULL) 4238 lcdskinfb = oledaddfb(320, 240); 4226 4239 else 4227 4240 lcdskinfb = oledaddfb(320, 240);
Note: See TracChangeset
for help on using the changeset viewer.