Changeset 24147 for titan/titan/subtitle.h

Timestamp:

10/08/13 23:12:11 (11 years ago)

Author:

nit

Message:

revert

File:

• titan/titan/subtitle.h (modified) (4 diffs)

titan/titan/subtitle.h

@@ -80 +80 @@
                 while(pageregnode != NULL)
                 {
-                        if(pageregnode->drawed == 0)
-                        {
-                                pageregnode = pageregnode->next;
-                                continue;                       
-                        }
-                        
                         struct subreg *regnode = subnode->regions;
                         while(regnode != NULL)
@@ -107 +101 @@
                 subfree(0);
         }
-}
-
-int checkfbregion(struct subpage* page)
-{
-        struct subpagereg* pageregnode = NULL;
-        int y, x;
-        
-        if(status.autosubtitle == 0) return 0;
-        if(page == NULL) return 0;
-        
-        pageregnode = page->pageregions;
-        while(pageregnode != NULL)
-        {
-                struct subreg *regnode = page->regions;
-                while(regnode != NULL)
-                {
-                        if(regnode->regid == pageregnode->regid) break;
-                        regnode = regnode->next;
-                }
-                
-                if(regnode != NULL && regnode->buf != NULL)
-                {
-                        int posx = pageregnode->reghorizontaladdress * skinfb->width / subdisplaywidth;
-                        int posy = pageregnode->regverticaladdress * skinfb->height / subdisplayheight;
-                        
-                        //check if drawing place is empty
-                        for(y = 0; y < regnode->scaleheight; y++)
-                        {
-                                if(y == 0 || y == regnode->scaleheight - 1)
-                                {
-                                        for(x = 0; x < regnode->scalewidth; x++)
-                                        {
-                                                if(getpixel(posx + x, posy + y) != 0)
-                                                        return 1;
-                                        }
-                                }
-                                else
-                                {
-                                        if(getpixel(posx, posy + y) != 0 || getpixel(posx + regnode->scalewidth - 1, posy + y) != 0)
-                                                return 1;
-                                }
-                        }       
-                }
-                
-                pageregnode = pageregnode->next;
-        }
-        
-        return 0;
 }
 
@@ -189 +135 @@
 
         subclear(0);
-        
-        if(checkfbregion(page) == 1) return;
 
         pageregnode = page->pageregions;
@@ -212 +156 @@
                         pageregnode->scaleposx = posx;
                         pageregnode->scaleposy = posy;
-                        pageregnode->drawed = 1;
 
                         //scale