Support turbo2.

[vuplus_dvbapp] / lib / gdi / picload.h

diff --git a/lib/gdi/picload.h b/lib/gdi/picload.h
index a85567c..aaac65c 100644 (file)
--- a/lib/gdi/picload.h
+++ b/lib/gdi/picload.h
@@ -21,7 +21,7 @@ public:
        int oy;
        unsigned char *pic_buffer;
        std::string picinfo;
-       int test;
+       int bypp;
        
        Cfilepara(const char *mfile, int mid, std::string size)
        {
@@ -29,6 +29,7 @@ public:
                id = mid;
                pic_buffer = NULL;
                callback = true;
+               bypp = 3;
                picinfo = mfile;
                picinfo += + "\n" + size + "\n";
        }
@@ -85,18 +86,23 @@ class ePicLoad: public eMainloop, public eThread, public Object, public iObject
 
        void gotMessage(const Message &message);
        void thread();
-       int startThread(int what, const char *file, int x, int y);
+       int startThread(int what, const char *file, int x, int y, bool async=true);
+       void thread_finished();
 public:
+       void waitFinished();
        PSignal1<void, const char*> PictureData;
 
        ePicLoad();
        ~ePicLoad();
        
-       RESULT startDecode(const char *filename, int x=0, int y=0);
-       RESULT getThumbnail(const char *filename, int x=0, int y=0);
+       RESULT startDecode(const char *filename, int x=0, int y=0, bool async=true);
+       RESULT getThumbnail(const char *filename, int x=0, int y=0, bool async=true);
        RESULT setPara(PyObject *val);
        PyObject *getInfo(const char *filename);
        SWIG_VOID(int) getData(ePtr<gPixmap> &SWIG_OUTPUT);
 };
 
+//for old plugins
+SWIG_VOID(int) loadPic(ePtr<gPixmap> &SWIG_OUTPUT, std::string filename, int x, int y, int aspect, int resize_mode=0, int rotate=0, int background=0, std::string cachefile="");
+
 #endif // __picload_h__