git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
gdi
/
picload.h
diff --git
a/lib/gdi/picload.h
b/lib/gdi/picload.h
index a85567c0f01f35315e977481403863379478d952..f64fd2f9a0fff4ae2edc6d5ad35b17b0acdcd6fe 100644
(file)
--- a/
lib/gdi/picload.h
+++ b/
lib/gdi/picload.h
@@
-85,18
+85,23
@@
class ePicLoad: public eMainloop, public eThread, public Object, public iObject
void gotMessage(const Message &message);
void thread();
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:
public:
+ void waitFinished();
PSignal1<void, const char*> PictureData;
ePicLoad();
~ePicLoad();
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);
};
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__
#endif // __picload_h__