Changeset 41585
- Timestamp:
- 01/03/18 18:00:07 (6 years ago)
- Location:
- titan
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/lcdsamsung/lcd_weather.h
r41577 r41585 7 7 char* date; 8 8 char* day0; 9 char* day0_long; 9 10 char* day0_low; 10 11 char* day0_high; … … 15 16 char* day0_wind; 16 17 char* day1; 18 char* day1_long; 17 19 char* day1_low; 18 20 char* day1_high; … … 20 22 char* day1_icon; 21 23 char* day2; 24 char* day2_long; 22 25 char* day2_low; 23 26 char* day2_high; … … 25 28 char* day2_icon; 26 29 char* day3; 30 char* day3_long; 27 31 char* day3_low; 28 32 char* day3_high; … … 39 43 40 44 free(node->day0); node->day0 = NULL; 45 free(node->day0_long); node->day0_long = NULL; 41 46 free(node->day0_low); node->day0_low = NULL; 42 47 free(node->day0_high); node->day0_high = NULL; … … 48 53 49 54 free(node->day1); node->day1 = NULL; 55 free(node->day1_long); node->day1_long = NULL; 50 56 free(node->day1_low); node->day1_low = NULL; 51 57 free(node->day1_high); node->day1_high = NULL; … … 54 60 55 61 free(node->day2); node->day2 = NULL; 62 free(node->day2_long); node->day2_long = NULL; 56 63 free(node->day2_low); node->day2_low = NULL; 57 64 free(node->day2_high); node->day2_high = NULL; … … 60 67 61 68 free(node->day3); node->day3 = NULL; 69 free(node->day3_long); node->day3_long = NULL; 62 70 free(node->day3_low); node->day3_low = NULL; 63 71 free(node->day3_high); node->day3_high = NULL; … … 116 124 weather->day0_condition = getxmlentry(tmpstr2, "skytext="); 117 125 weather->day0 = getxmlentry(tmpstr2, " shortday="); 126 weather->day0_long = getxmlentry(tmpstr2, " day="); 127 118 128 } 119 129 … … 139 149 weather->day1_condition = getxmlentry(tmpstr2, "skytextday="); 140 150 weather->day1 = getxmlentry(tmpstr2, " shortday="); 151 weather->day1_long = getxmlentry(tmpstr2, " day="); 141 152 } 142 153 … … 150 161 weather->day2_condition = getxmlentry(tmpstr2, "skytextday="); 151 162 weather->day2 = getxmlentry(tmpstr2, " shortday="); 163 weather->day2_long = getxmlentry(tmpstr2, " day="); 152 164 } 153 165 … … 161 173 weather->day3_condition = getxmlentry(tmpstr2, "skytextday="); 162 174 weather->day3 = getxmlentry(tmpstr2, " shortday="); 175 weather->day3_long = getxmlentry(tmpstr2, " day="); 163 176 } 164 177 … … 365 378 fprintf(ausg,"%s\n",node->day1); 366 379 fprintf(ausg,"%s\n",node->day1_low); 367 fprintf(ausg,"%s C\n",node->day1_high); 380 //fprintf(ausg,"%s C\n",node->day1_high); 381 fprintf(ausg,"%s\n",node->day1_high); 368 382 fprintf(ausg,"%s\n",node->day1_condition); 369 383 tmpstr = changeweatherpic(node->day1_icon); … … 373 387 fprintf(ausg,"%s\n",node->day2); 374 388 fprintf(ausg,"%s\n",node->day2_low); 375 fprintf(ausg,"%s C\n",node->day2_high); 389 //fprintf(ausg,"%s C\n",node->day2_high); 390 fprintf(ausg,"%s\n",node->day2_high); 376 391 fprintf(ausg,"%s\n",node->day2_condition); 377 392 tmpstr = changeweatherpic(node->day2_icon); … … 381 396 fprintf(ausg,"%s\n",node->day3); 382 397 fprintf(ausg,"%s\n",node->day3_low); 383 fprintf(ausg,"%s C\n",node->day3_high); 398 //fprintf(ausg,"%s C\n",node->day3_high); 399 fprintf(ausg,"%s\n",node->day3_high); 384 400 fprintf(ausg,"%s\n",node->day3_condition); 385 401 tmpstr = changeweatherpic(node->day3_icon); 386 402 fprintf(ausg,"%s\n",tmpstr); 387 403 free(tmpstr); tmpstr = NULL; 404 405 //wegen compatibilitaet hinten dran 406 fprintf(ausg,"%s\n",node->city); 407 fprintf(ausg,"%s\n",node->day0_wind); 408 fprintf(ausg,"%s\%\n",node->day0_humidity); 409 fprintf(ausg,"%s\n",node->day0_long); 410 fprintf(ausg,"%s\n",node->day1_long); 411 fprintf(ausg,"%s\n",node->day2_long); 412 fprintf(ausg,"%s\n",node->day3_long); 413 414 415 416 388 417 389 418 fclose(ausg); -
titan/plugins/lcdsamsung/lcdsamsung.c
r41572 r41585 113 113 struct skin* LCD_Play = NULL; 114 114 115 116 struct skin* city = NULL; 117 struct skin* wind = NULL; 118 struct skin* luft = NULL; 115 119 struct skin* day0_t = NULL; 120 struct skin* day0_tm = NULL; 116 121 struct skin* day0_i = NULL; 117 122 struct skin* day0_d = NULL; 123 struct skin* day0_dl = NULL; 118 124 struct skin* day1_t = NULL; 125 struct skin* day1_tm = NULL; 119 126 struct skin* day1_i = NULL; 120 127 struct skin* day1_d = NULL; 128 struct skin* day1_dl = NULL; 121 129 struct skin* day2_t = NULL; 130 struct skin* day2_tm = NULL; 122 131 struct skin* day2_i = NULL; 123 132 struct skin* day2_d = NULL; 133 struct skin* day2_dl = NULL; 124 134 struct skin* day3_t = NULL; 135 struct skin* day3_tm = NULL; 125 136 struct skin* day3_i = NULL; 126 137 struct skin* day3_d = NULL; 138 struct skin* day3_dl = NULL; 127 139 struct skin* akttime = NULL; 128 140 struct skin* akttime_Standby = NULL; … … 138 150 struct skin* n_minute2_standby = NULL; 139 151 152 struct skin* scity = NULL; 153 struct skin* swind = NULL; 154 struct skin* sluft = NULL; 140 155 struct skin* sday0_t = NULL; 156 struct skin* sday0_tm = NULL; 141 157 struct skin* sday0_i = NULL; 142 158 struct skin* sday0_d = NULL; 159 struct skin* sday0_dl = NULL; 143 160 struct skin* sday1_t = NULL; 161 struct skin* sday1_tm = NULL; 144 162 struct skin* sday1_i = NULL; 145 163 struct skin* sday1_d = NULL; 164 struct skin* sday1_dl = NULL; 146 165 struct skin* sday2_t = NULL; 166 struct skin* sday2_tm = NULL; 147 167 struct skin* sday2_i = NULL; 148 168 struct skin* sday2_d = NULL; 169 struct skin* sday2_dl = NULL; 149 170 struct skin* sday3_t = NULL; 171 struct skin* sday3_tm = NULL; 150 172 struct skin* sday3_i = NULL; 151 173 struct skin* sday3_d = NULL; 174 struct skin* sday3_dl = NULL; 152 175 153 176 … … 186 209 else 187 210 LCD_Samsung1 = getscreen("LCD_spf87_Wetter"); 211 city = getscreennode(LCD_Samsung1, "city"); 212 wind = getscreennode(LCD_Samsung1, "wind"); 213 luft = getscreennode(LCD_Samsung1, "luft"); 188 214 day0_t = getscreennode(LCD_Samsung1, "day0_t"); 215 day0_tm = getscreennode(LCD_Samsung1, "day0_tm"); 189 216 day0_i = getscreennode(LCD_Samsung1, "day0_i"); 190 217 day0_d = getscreennode(LCD_Samsung1, "day0_d"); 218 day0_dl = getscreennode(LCD_Samsung1, "day0_dl"); 191 219 day1_t = getscreennode(LCD_Samsung1, "day1_t"); 220 day1_tm = getscreennode(LCD_Samsung1, "day1_tm"); 192 221 day1_i = getscreennode(LCD_Samsung1, "day1_i"); 193 222 day1_d = getscreennode(LCD_Samsung1, "day1_d"); 223 day1_dl = getscreennode(LCD_Samsung1, "day1_dl"); 194 224 day2_t = getscreennode(LCD_Samsung1, "day2_t"); 225 day2_tm = getscreennode(LCD_Samsung1, "day2_tm"); 195 226 day2_i = getscreennode(LCD_Samsung1, "day2_i"); 196 227 day2_d = getscreennode(LCD_Samsung1, "day2_d"); 228 day2_dl = getscreennode(LCD_Samsung1, "day2_dl"); 197 229 day3_t = getscreennode(LCD_Samsung1, "day3_t"); 230 day3_tm = getscreennode(LCD_Samsung1, "day3_tm"); 198 231 day3_i = getscreennode(LCD_Samsung1, "day3_i"); 199 232 day3_d = getscreennode(LCD_Samsung1, "day3_d"); 233 day3_dl = getscreennode(LCD_Samsung1, "day3_dl"); 200 234 akttime = getscreennode(LCD_Samsung1, "akttime"); 201 235 akttime = getscreennode(LCD_Samsung1, "akttime"); … … 369 403 LCD_Standby = getscreen("LCD_spf87_Standby"); 370 404 akttime_Standby = getscreennode(LCD_Standby, "akttime"); 405 scity = getscreennode(LCD_Standby, "city"); 406 swind = getscreennode(LCD_Standby, "wind"); 407 sluft = getscreennode(LCD_Standby, "luft"); 371 408 sday0_t = getscreennode(LCD_Standby, "day0_t"); 409 sday0_tm = getscreennode(LCD_Standby, "day0_tm"); 372 410 sday0_i = getscreennode(LCD_Standby, "day0_i"); 373 411 sday0_d = getscreennode(LCD_Standby, "day0_d"); 412 sday0_dl = getscreennode(LCD_Standby, "day0_dl"); 374 413 sday1_t = getscreennode(LCD_Standby, "day1_t"); 414 sday1_tm = getscreennode(LCD_Standby, "day1_tm"); 375 415 sday1_i = getscreennode(LCD_Standby, "day1_i"); 376 416 sday1_d = getscreennode(LCD_Standby, "day1_d"); 417 sday1_dl = getscreennode(LCD_Standby, "day1_dl"); 377 418 sday2_t = getscreennode(LCD_Standby, "day2_t"); 419 sday2_tm = getscreennode(LCD_Standby, "day2_tm"); 378 420 sday2_i = getscreennode(LCD_Standby, "day2_i"); 379 421 sday2_d = getscreennode(LCD_Standby, "day2_d"); 422 sday2_dl = getscreennode(LCD_Standby, "day2_dl"); 380 423 sday3_t = getscreennode(LCD_Standby, "day3_t"); 424 sday3_tm = getscreennode(LCD_Standby, "day3_tm"); 381 425 sday3_i = getscreennode(LCD_Standby, "day3_i"); 382 426 sday3_d = getscreennode(LCD_Standby, "day3_d"); 427 sday3_dl = getscreennode(LCD_Standby, "day3_dl"); 383 428 384 429 n_stunde_standby = getscreennode(LCD_Standby, "stunde"); … … 570 615 changetext(day0_d, fileline); 571 616 changetext(sday0_d, fileline); 572 weather_getline(fd, fileline);weather_getline(fd, fileline); 617 weather_getline(fd, fileline); 618 changetext(day0_tm, fileline); 619 changetext(sday0_tm, fileline); 620 weather_getline(fd, fileline); 573 621 changetext(day0_t, fileline); 574 622 changetext(sday0_t, fileline); … … 581 629 changetext(day1_d, fileline); 582 630 changetext(sday1_d, fileline); 583 weather_getline(fd, fileline);weather_getline(fd, fileline); 631 weather_getline(fd, fileline); 632 changetext(day1_tm, fileline); 633 changetext(sday1_tm, fileline); 634 weather_getline(fd, fileline); 584 635 changetext(day1_t, fileline); 585 636 changetext(sday1_t, fileline); … … 592 643 changetext(day2_d, fileline); 593 644 changetext(sday2_d, fileline); 594 weather_getline(fd, fileline);weather_getline(fd, fileline); 645 weather_getline(fd, fileline); 646 changetext(day2_tm, fileline); 647 changetext(sday2_tm, fileline); 648 weather_getline(fd, fileline); 595 649 changetext(day2_t, fileline); 596 650 changetext(sday2_t, fileline); … … 603 657 changetext(day3_d, fileline); 604 658 changetext(sday3_d, fileline); 605 weather_getline(fd, fileline);weather_getline(fd, fileline); 659 weather_getline(fd, fileline); 660 changetext(day3_tm, fileline); 661 changetext(sday3_tm, fileline); 662 weather_getline(fd, fileline); 606 663 changetext(day3_t, fileline); 607 664 changetext(sday3_t, fileline); … … 610 667 changepic(day3_i, fileline); 611 668 changepic(sday3_i, fileline); 669 670 weather_getline(fd, fileline); 671 changepic(city, fileline); 672 changepic(scity, fileline); 673 weather_getline(fd, fileline); 674 changetext(wind, fileline); 675 changetext(swind, fileline); 676 weather_getline(fd, fileline); 677 changetext(luft, fileline); 678 changetext(sluft, fileline); 679 weather_getline(fd, fileline); 680 changetext(day0_dl, fileline); 681 changetext(sday0_dl, fileline); 682 weather_getline(fd, fileline); 683 changetext(day1_dl, fileline); 684 changetext(sday1_dl, fileline); 685 weather_getline(fd, fileline); 686 changetext(day2_dl, fileline); 687 changetext(sday2_dl, fileline); 688 weather_getline(fd, fileline); 689 changetext(day3_dl, fileline); 690 changetext(sday3_dl, fileline); 691 612 692 } 613 693 else … … 615 695 weather_getline(fd, fileline);weather_getline(fd, fileline); 616 696 changetext(day0_d, fileline); 617 weather_getline(fd, fileline);weather_getline(fd, fileline); 697 weather_getline(fd, fileline); 698 changetext(day0_tm, fileline); 699 weather_getline(fd, fileline); 618 700 changetext(day0_t, fileline); 619 701 weather_getline(fd, fileline); … … 623 705 weather_getline(fd, fileline); 624 706 changetext(day1_d, fileline); 625 weather_getline(fd, fileline);weather_getline(fd, fileline); 707 weather_getline(fd, fileline); 708 changetext(day1_tm, fileline); 709 weather_getline(fd, fileline); 626 710 changetext(day1_t, fileline); 627 711 weather_getline(fd, fileline); … … 631 715 weather_getline(fd, fileline); 632 716 changetext(day2_d, fileline); 633 weather_getline(fd, fileline);weather_getline(fd, fileline); 717 weather_getline(fd, fileline); 718 changetext(day2_tm, fileline); 719 weather_getline(fd, fileline); 634 720 changetext(day2_t, fileline); 635 721 weather_getline(fd, fileline); … … 639 725 weather_getline(fd, fileline); 640 726 changetext(day3_d, fileline); 641 weather_getline(fd, fileline);weather_getline(fd, fileline); 727 weather_getline(fd, fileline); 728 changetext(day3_tm, fileline); 729 weather_getline(fd, fileline); 642 730 changetext(day3_t, fileline); 643 731 weather_getline(fd, fileline); 644 732 weather_getline(fd, fileline); 645 733 changepic(day3_i, fileline); 734 735 weather_getline(fd, fileline); 736 changepic(city, fileline); 737 weather_getline(fd, fileline); 738 changetext(wind, fileline); 739 weather_getline(fd, fileline); 740 changetext(luft, fileline); 741 weather_getline(fd, fileline); 742 changetext(day0_dl, fileline); 743 weather_getline(fd, fileline); 744 changetext(day1_dl, fileline); 745 weather_getline(fd, fileline); 746 changetext(day2_dl, fileline); 747 weather_getline(fd, fileline); 748 changetext(day3_dl, fileline); 646 749 } 647 750 fclose(fd); … … 770 873 else if(type == 2) 771 874 { 772 if(status.mcaktiv == 1) 773 playertype = 0; 774 else 775 //playertype = getconfigint("playertype", NULL);^ 776 playertype = 1; 875 playertype = getconfigint("lastplayertype", NULL); 876 //if(status.mcaktiv == 1) 877 //playertype = 0; 878 //else 879 ////playertype = getconfigint("playertype", NULL); 880 //playertype = 1; 777 881 778 882 if(playertype == 1) -
titan/titan/play.h
r41465 r41585 1643 1643 //if(getconfigint("playertype", NULL) == 1 && cmpfilenameext(file, ".ts") == 0) 1644 1644 if(cmpfilenameext(file, ".ts") == 0) 1645 { 1645 1646 playertype = 1; 1647 addconfig("lastplayertype", "1"); 1648 } 1649 else 1650 addconfig("lastplayertype", "0"); 1646 1651 1647 1652 if(startfile == NULL)
Note: See TracChangeset
for help on using the changeset viewer.