Changeset 13469
- Timestamp:
- 01/16/12 19:22:12 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/diseqcconfig.h
r12534 r13469 25 25 } 26 26 27 void changediseqcmode(struct skin* committedcmd, struct skin* cmdorder, struct skin* uncommittedcmd, struct skin* rotorpos, struct skin* diseqcrepeat, char *type)27 void changediseqcmode(struct skin* committedcmd, struct skin* cmdorder, struct skin* uncommittedcmd, struct skin* rotorpos, struct skin* diseqcrepeat, struct skin* latitude, struct skin* longitude, struct skin* eastwest, char *type) 28 28 { 29 29 committedcmd->hidden = YES; … … 32 32 rotorpos->hidden = YES; 33 33 diseqcrepeat->hidden = YES; 34 35 if(type == NULL || ostrcmp(type, "0") == 0 || ostrcmp(type, "1") == 0 || ostrcmp(type, "2") == 0) 34 latitude->hidden = YES; 35 longitude->hidden = YES; 36 eastwest->hidden = YES; 37 38 if(type == NULL || ostrcmp(type, "0") == 0 || ostrcmp(type, "1") == 0 || ostrcmp(type, "2") == 0 || ostrcmp(type, "3") == 0) 36 39 { 37 40 committedcmd->hidden = NO; … … 43 46 if(ostrcmp(type, "2") == 0) 44 47 rotorpos->hidden = NO; 45 } 46 } 47 48 void changediseqc(struct skin* diseqcmode, struct skin* toneburst, struct skin* committedcmd, struct skin* cmdorder, struct skin* uncommittedcmd, struct skin* diseqcrepeat, struct skin* rotorpos, char* feshortname, char *diseqcnr) 48 if(ostrcmp(type, "3") == 0) 49 { 50 latitude->hidden = NO; 51 longitude->hidden = NO; 52 eastwest->hidden = NO; 53 } 54 } 55 } 56 57 void changediseqc(struct skin* diseqcmode, struct skin* toneburst, struct skin* committedcmd, struct skin* cmdorder, struct skin* uncommittedcmd, struct skin* diseqcrepeat, struct skin* rotorpos, struct skin* latitude, struct skin* longitude, struct skin* eastwest, char* feshortname, char *diseqcnr) 49 58 { 50 59 char* tmpstr = NULL, *tmpnr = NULL; … … 98 107 } 99 108 setchoiceboxselection(rotorpos, getconfig(tmpstr, NULL)); 109 free(tmpstr); 110 111 tmpstr = ostrcat(feshortname, "_diseqc_latitude", 0, 0); 112 tmpstr = ostrcat(tmpstr, diseqcnr, 1, 0); 113 changename(latitude, tmpstr); 114 changeinput(latitude, getconfig(tmpstr, NULL)); 115 free(tmpstr); 116 117 tmpstr = ostrcat(feshortname, "_diseqc_longitude", 0, 0); 118 tmpstr = ostrcat(tmpstr, diseqcnr, 1, 0); 119 changename(longitude, tmpstr); 120 changeinput(longitude, getconfig(tmpstr, NULL)); 121 free(tmpstr); 122 123 tmpstr = ostrcat(feshortname, "_diseqc_eastwest", 0, 0); 124 tmpstr = ostrcat(tmpstr, diseqcnr, 1, 0); 125 changename(eastwest, tmpstr); 126 setchoiceboxselection(eastwest, getconfig(tmpstr, NULL)); 100 127 free(tmpstr); 101 128 } … … 114 141 struct skin* diseqcrepeat = getscreennode(diseqcscreen, "diseqcrepeat"); 115 142 struct skin* rotorpos = getscreennode(diseqcscreen, "rotorpos"); 143 struct skin* latitude = getscreennode(diseqcscreen, "latitude"); 144 struct skin* longitude = getscreennode(diseqcscreen, "longitude"); 145 struct skin* eastwest = getscreennode(diseqcscreen, "eastwest"); 116 146 struct skin* tmp = NULL; 117 147 char* tmpstr = NULL; … … 129 159 addchoicebox(diseqcmode, "1", _("DiSEqC 1.1")); 130 160 addchoicebox(diseqcmode, "2", _("DiSEqC 1.2")); 161 addchoicebox(diseqcmode, "3", _("DiSEqC 1.3 (USALS)")); 131 162 addchoicebox(diseqcmode, "100", _("Tonburst A/B")); 132 163 … … 176 207 changeinput(diseqcrepeat, "1\n2\n3\n4\n5\n6"); 177 208 178 changediseqc(diseqcmode, toneburst, committedcmd, cmdorder, uncommittedcmd, diseqcrepeat, rotorpos, feshortname, diseqcnr); 209 changemask(latitude, "000"); 210 changemask(longitude, "000"); 211 212 changeinput(eastwest, NULL); 213 addchoicebox(eastwest, "0", _("east")); 214 addchoicebox(eastwest, "1", _("west")); 215 216 changediseqc(diseqcmode, toneburst, committedcmd, cmdorder, uncommittedcmd, diseqcrepeat, rotorpos, latitude, longitude, eastwest, feshortname, diseqcnr); 179 217 180 218 tmpstr = ostrcat(feshortname, "_diseqc_mode", 0, 0); 181 changediseqcmode(committedcmd, cmdorder, uncommittedcmd, rotorpos, diseqcrepeat, getconfig(tmpstr, diseqcnr));219 changediseqcmode(committedcmd, cmdorder, uncommittedcmd, rotorpos, diseqcrepeat, latitude, longitude, eastwest, getconfig(tmpstr, diseqcnr)); 182 220 free(tmpstr); tmpstr = NULL; 183 221 free(diseqcnr); diseqcnr = NULL; … … 196 234 if(listbox->select != NULL && listbox->select->name != NULL && strstr(listbox->select->name, "diseqc_mode") != NULL && (rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL))) 197 235 { 198 changediseqcmode(committedcmd, cmdorder, uncommittedcmd, rotorpos, diseqcrepeat, diseqcmode->ret);236 changediseqcmode(committedcmd, cmdorder, uncommittedcmd, rotorpos, diseqcrepeat, latitude, longitude, eastwest, diseqcmode->ret); 199 237 changeuncommittedcmd(cmdorder, diseqcmode->ret); 200 238 } … … 207 245 addconfigscreentmpcheck(uncommittedcmd->name, uncommittedcmd, "0"); 208 246 addconfigscreentmpcheck(rotorpos->name, rotorpos, "000"); 247 addconfigscreentmpcheck(latitude->name, latitude, "000"); 248 addconfigscreentmpcheck(longitude->name, longitude, "000"); 249 addconfigscreentmpcheck(eastwest->name, eastwest, "0"); 209 250 210 251 status.screencalc = 0; … … 212 253 213 254 if(rcret == getrcconfigint("rcexit", NULL)) break; 214 if(rcret == getrcconfigint("rc ok", NULL))255 if(rcret == getrcconfigint("rcgreen", NULL)) 215 256 { 216 257 writeconfigtmp(); … … 226 267 changename(diseqcrepeat, "diseqcrepeat"); 227 268 changename(rotorpos, "rotorpos"); 269 changename(latitude, "latitude"); 270 changename(longitude, "longitude"); 271 changename(eastwest, "eastwest"); 228 272 229 273 status.screencalc = 0;
Note: See TracChangeset
for help on using the changeset viewer.