Changeset 12241
- Timestamp:
- 12/11/11 18:24:31 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/avsettings.h
r12067 r12241 11 11 struct skin* listbox = getscreennode(avsettings, "listbox"); 12 12 struct skin* resolution = getscreennode(avsettings, "resolution"); 13 struct skin* aktresolution = getscreennode(avsettings, "aktresolution"); 13 14 struct skin* autoresolution = getscreennode(avsettings, "autoresolution"); 14 15 struct skin* autoressd = getscreennode(avsettings, "autoressd"); … … 29 30 free(ret); ret = NULL; 30 31 31 ret = getconfig("av_videomode _default", NULL);32 ret = getconfig("av_videomode", NULL); 32 33 if(ret == NULL) 33 34 { 34 35 ret = getvideomode(); 35 addconfig("av_videomode_default", ret);36 36 setchoiceboxselection(resolution, ret); 37 37 free(ret); ret = NULL; … … 39 39 else 40 40 setchoiceboxselection(resolution, ret); 41 42 ret = getvideomode(); 43 changeinput(aktresolution, ret); 44 free(ret); ret = NULL; 41 45 42 46 autoressd->hidden=YES; … … 185 189 if(ostrcmp(ret, resolution->ret) != 0) 186 190 { 187 setvideomode(resolution->ret );191 setvideomode(resolution->ret, 0); 188 192 changefbresolution(resolution->ret); 189 addconfig("av_videomode_default", resolution->ret);190 193 if(flag == 0) 191 194 { … … 193 196 if(tret == 0 || tret == 1) 194 197 { 195 setvideomode(ret );198 setvideomode(ret, 0); 196 199 changefbresolution(ret); 197 addconfig("av_videomode_default", ret);198 200 } 199 201 -
titan/titan/global.h
r12234 r12241 537 537 if(value[0] == 'y') 538 538 { 539 setvideomode("720p50" );539 setvideomode("720p50", 0); 540 540 changefbresolution("720p50"); 541 541 setcolorformat("hdmi_rgb"); … … 543 543 else 544 544 { 545 setvideomode("576i50" );545 setvideomode("576i50", 0); 546 546 changefbresolution("576i50"); 547 547 setcolorformat("rgb"); … … 2582 2582 if(ostrcmp("pal", tmpstr) == 0 || ostrncmp("576", tmpstr, 3) == 0) 2583 2583 { 2584 setvideomode("720p50" );2584 setvideomode("720p50", 0); 2585 2585 changefbresolution("720p50"); 2586 2586 } 2587 2587 else if(ostrncmp("720", tmpstr, 3) == 0) 2588 2588 { 2589 setvideomode("1080i50" );2589 setvideomode("1080i50", 0); 2590 2590 changefbresolution("1080i50"); 2591 2591 } 2592 2592 else if(ostrncmp("1080", tmpstr, 4) == 0) 2593 2593 { 2594 setvideomode("576i50" );2594 setvideomode("576i50", 0); 2595 2595 changefbresolution("576i50"); 2596 2596 } … … 2599 2599 if(ret == 0 || ret == 1) 2600 2600 { 2601 setvideomode(tmpstr );2601 setvideomode(tmpstr, 0); 2602 2602 changefbresolution(tmpstr); 2603 2603 } … … 2607 2607 } 2608 2608 2609 int setvideomode(char* value) 2609 //flag 0: write videomode to config 2610 //flag 1: don't write videomode to config 2611 int setvideomode(char* value, int flag) 2610 2612 { 2611 2613 debug(1000, "in"); … … 2619 2621 debug(100, "set %s to %s", videomodedev, value); 2620 2622 ret = writesys(videomodedev, value, 0); 2621 if(ret == 0 ) addconfig("av_videomode", value);2623 if(ret == 0 && flag == 0) addconfig("av_videomode", value); 2622 2624 return ret; 2623 2625 } … … 3716 3718 if (ostrcmp(res_akt, res) != 0) 3717 3719 { 3718 setvideomode(res );3720 setvideomode(res, 1); 3719 3721 changefbresolution(res); 3720 3722 sleep(1); -
titan/titan/header.h
r12235 r12241 315 315 void m_unlock(pthread_mutex_t *mutex, int flag); 316 316 int setcolorformat(char* value); 317 int setvideomode(char* value );317 int setvideomode(char* value, int flag); 318 318 char* convert_timesec(int sec); 319 319 int writesys(const char *filename, char *value, int flag); -
titan/titan/keyactions.h
r12050 r12241 166 166 if(ostrcmp(res_act, res) == 0) 167 167 { 168 res_def = getconfig("av_videomode _default", NULL);168 res_def = getconfig("av_videomode", NULL); 169 169 if(res_def == NULL) 170 170 res_def = res_act; 171 setvideomode(res_def );171 setvideomode(res_def, 1); 172 172 changefbresolution(res_def); 173 173 sleep(2); … … 176 176 else 177 177 { 178 setvideomode(res );178 setvideomode(res, 1); 179 179 changefbresolution(res); 180 180 sleep(2); -
titan/titan/titan.c
r12210 r12241 377 377 setfanspeed(-1, 0); 378 378 379 if(getconfig("av_videomode_default", NULL) == NULL) 380 ret = setvideomode(getconfig("av_videomode", NULL)); 381 else 382 ret = setvideomode(getconfig("av_videomode_default", NULL)); 379 ret = setvideomode(getconfig("av_videomode", NULL), 0); 383 380 384 381 ret = setpolicy(getconfig("av_policy", NULL)); … … 571 568 if(file_exist("/tmp/.scart")) 572 569 { 573 setvideomode("pal" );570 setvideomode("pal", 0); 574 571 changefbresolution("pal"); 575 572 }
Note: See TracChangeset
for help on using the changeset viewer.