Changeset 32791
- Timestamp:
- 01/30/15 16:49:48 (9 years ago)
- Location:
- titan/plugins/gmediarender
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/gmediarender/gmediarender.h
r32741 r32791 76 76 void screengmediarender() 77 77 { 78 int rcret = -1, ret = 0 ;78 int rcret = -1, ret = 0, rcsaverwait = 0, count = 0, screensaver_delay = 0, rcwait = 1000; 79 79 char* cmd = NULL, *buf = NULL, *tmpstr = NULL, *tmpstr1 = NULL; 80 80 int fifo = -1; … … 82 82 struct skin* servername = getscreennode(gmediarender, "servername"); 83 83 struct skin* connect = getscreennode(gmediarender, "connect"); 84 84 struct skin* loading = getscreen("loading"); 85 85 86 ret = servicestop(status.aktservice, 1, 1); 86 87 if(ret == 1) return; … … 137 138 138 139 //load screenserver 139 int count = 0, screensaver_delay = 0, saver = 0, rcwait = 1000;140 140 if(getconfigint("screensaver", NULL) == 1) 141 141 { … … 143 143 initscreensaver(); 144 144 } 145 // 145 // 146 146 while(1) 147 147 { … … 155 155 changetext(connect, _("DLNA Control Client connected !")); 156 156 buf[ret] = '\0'; 157 157 158 if(ostrcmp(buf, "clear.png") == 0) //clear screen 158 159 { 160 servername->hidden = NO; 161 connect->hidden = NO; 159 162 count = 0; 160 163 rcwait = 1000; 161 // if(getconfigint("screensaver", NULL) == 1) 164 rcsaverwait = 0; 165 servicestop(status.aktservice, 1, 1); 166 drawscreen(skin, 0, 0); 167 } 168 else if(ostrcmp(buf, "done.png") == 0) //clear screen 169 { 170 count = 0; 171 rcwait = 1000; 172 servicestop(status.aktservice, 1, 1); 173 drawscreen(skin, 0, 0); 174 changepic(gmediarender, "%pluginpath%/gmediarender/skin/background.jpg"); 175 drawscreen(gmediarender, 0, 0); 176 } 177 else if(ostrcmp(buf, "saver.png") == 0) //saver screen 178 { 179 servername->hidden = NO; 180 connect->hidden = NO; 181 182 if(getconfigint("screensaver", NULL) == 1) 183 { 184 count = 1; 185 rcsaverwait = 0; 162 186 drawscreen(skin, 0, 0); 163 // else164 // drawscreen(gmediarender, 0, 0);165 // printf("clear.png set count=%d set rcwait=%d\n", count, rcwait);166 }167 else if(ostrcmp(buf, "saver.png") == 0) //saver screen168 {169 if(getconfigint("screensaver", NULL) == 1)170 {171 count = 1;172 drawscreen(skin, 0, 0);173 187 } 174 188 else 175 189 { 176 // count = 0;190 servicestop(status.aktservice, 1, 1); 177 191 changepic(gmediarender, "%pluginpath%/gmediarender/skin/background.jpg"); 178 192 drawscreen(gmediarender, 0, 0); 179 193 } 180 181 // printf("11saver.png set count=%d\n", count);182 194 } 183 195 else … … 185 197 count = 0; 186 198 rcwait = 1000; 187 // drawscreen(skin, 0, 0); 199 servername->hidden = YES; 200 connect->hidden = YES; 201 drawscreen(skin, 0, 0); 202 drawscreen(loading, 0, 0); 188 203 gmediarendergetpic(gmediarender, buf); 189 // printf("buf: %s set count=%d\n set rcwait=%d", buf, count, rcwait);190 204 } 191 205 } … … 197 211 { 198 212 count++; 199 // printf("count++ %d\n", count); 200 } 201 213 } 214 202 215 if(count > screensaver_delay && screensaver != NULL) 203 { 204 // printf("showscreensaver %d\n", count); 205 showscreensaver(); 206 rcwait = screensaver->speed; 216 { 217 if(rcsaverwait == 0) 218 { 219 showscreensaver(); 220 rcsaverwait = screensaver->speed; 221 } 222 223 if(count * 1000 >= rcsaverwait) 224 { 225 showscreensaver(); 226 rcsaverwait += screensaver->speed; 227 } 207 228 } 208 229 } 209 //////210 230 } 211 231 -
titan/plugins/gmediarender/gmediarender.sh
r23427 r32791 6 6 export PATH=$PATH:/var/swap/bin:/mnt/swapextensions/bin:/var/bin 7 7 8 gmediarender -f $1 --gst-debug-disable 8 if [ -e /.gstreamer-0.10 ];then 9 gmediarender -f $1 --gst-debug-disable 10 else 11 gmediarender -f $1 12 fi 9 13 echo close gmediarender
Note: See TracChangeset
for help on using the changeset viewer.