Changeset 26495

Timestamp:

02/26/14 21:18:25 (9 years ago)

Author:

obi

Message:

titan add vusolo2

Location:

titan/titan

Files:

• avsettings.h (modified) (2 diffs)
• fb.h (modified) (5 diffs)
• infobar.h (modified) (1 diff)
• titan.c (modified) (2 diffs)

titan/titan/avsettings.h

@@ -242 +242 @@
                                 {
                                         setvideomode(resolution->ret, 0);
-//                                      if(checkbox("ATEMIO5000") != 1)
-                                                changefbresolution(resolution->ret, 0);
+                                        changefbresolution(resolution->ret, 0);
                                         if(flag == 0)
                                         {
@@ -250 +249 @@
                                                 {
                                                         setvideomode(ret, 0);
-//                                                      if(checkbox("ATEMIO5000") != 1)
-                                                                changefbresolution(ret, 0);
+                                                        changefbresolution(ret, 0);
                                                 }
                                                 else

titan/titan/fb.h

@@ -193 +193 @@
         fd = open(fbdev, O_RDWR);
 
-        // blinking work start
-        if(checkbox("ATEMIO5000") == 1)
-        {
-                if (fd < 0)
-                {
+// blinking work start
+#ifdef EPLAYER4
+        if (fd < 0)
+        {
                         perror(fbdev);
                         goto nolfb;
                 }
-        }
-        // blinking work end
+#endif
+// blinking work end
                 
         if(fd == -1)
@@ -241 +240 @@
         }
 
-        if (checkbox("ATEMIO5000") == 1 && var_screeninfo.bits_per_pixel != 32)
+#ifdef EPLAYER4
+        if (var_screeninfo.bits_per_pixel != 32)
         {
                 debug(100, "Only 32 bit per pixel supported. Framebuffer currently use %d", var_screeninfo.bits_per_pixel);
@@ -247 +247 @@
                 return 0;
         }
+#endif
 
 
@@ -281 +282 @@
 void closefb()
 {
-        if(checkbox("ATEMIO5000") == 1)
-        {
-                if(lfb)
-                {
-                        debug(100, "ms_sync");
-                        msync(lfb, fix_screeninfo.smem_len, MS_SYNC);
-                        munmap(lfb, fix_screeninfo.smem_len);
-                }
-                if(fb->fd >= 0)
-                {
-                        debug(100, "close");
-                        disablemanualblit();
-                        close(fb->fd);
-                        fb->fd = -1;
-                }
-        }
+
+#ifdef EPLAYER4
+        if(lfb)
+        {
+                debug(100, "ms_sync");
+                msync(lfb, fix_screeninfo.smem_len, MS_SYNC);
+                munmap(lfb, fix_screeninfo.smem_len);
+        }
+        if(fb->fd >= 0)
+        {
+                debug(100, "close");
+                disablemanualblit();
+                close(fb->fd);
+                fb->fd = -1;
+        }
+#endif
 
         if(fb != NULL)
@@ -337 +338 @@
 {
         debug(100, "fb->colbytes: %d", fb->colbytes);
-        if(checkbox("ATEMIO5000") == 1) return;
+#ifdef EPLAYER4
+        return;
+#endif
 
         if(ostrcmp("pal", value) == 0)

titan/titan/infobar.h

@@ -66 +66 @@
                         {
                                 if(playpic == 1) {
-                                        if (checkbox("ATEMIO5000") != 1)
+//it anymore needed
+//                                      if (checkbox("ATEMIO5000") != 1)
                                                 clearscreen(playinfobarpic);
                                         drawscreen(playinfobarpic, 0, 0);

titan/titan/titan.c

@@ -714 +714 @@
         initlocale(getconfig("localepath", NULL));
 
-        if(checkbox("ATEMIO5000") == 1)
-                bcm_accel_init();
+#ifdef EPLAYER4
+        bcm_accel_init();
+#endif
 
         fb = openfb(getconfig("fbdev", NULL), 0);
@@ -722 +723 @@
         clearfball();
         enablemanualblit();
-        if(checkbox("ATEMIO5000") == 1)
-                waitvsync();
+        
+#ifdef EPLAYER4
+        waitvsync();
+#endif
 
         tmpstr = getconfig("fb1dev", NULL);