Movie.h (pymol-open-source-2.2.0) | : | Movie.h (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
H* ------------------------------------------------------------------- | H* ------------------------------------------------------------------- | |||
I* Additional authors of this source file include: | I* Additional authors of this source file include: | |||
-* | -* | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_Movie | #ifndef _H_Movie | |||
#define _H_Movie | #define _H_Movie | |||
#include <memory> | ||||
#include"os_python.h" | #include"os_python.h" | |||
#include"Ortho.h" | #include"Ortho.h" | |||
#include"Scene.h" | #include"Scene.h" | |||
#include"View.h" | #include"View.h" | |||
typedef char MovieCmdType[OrthoLineLength]; | typedef char MovieCmdType[OrthoLineLength]; | |||
int MovieFromPyList(PyMOLGlobals * G, PyObject * list, int *warning); | int MovieFromPyList(PyMOLGlobals * G, PyObject * list, int *warning); | |||
PyObject *MovieAsPyList(PyMOLGlobals * G); | PyObject *MovieAsPyList(PyMOLGlobals * G); | |||
int MovieGetSpecLevel(PyMOLGlobals *G,int frame); | int MovieGetSpecLevel(PyMOLGlobals *G,int frame); | |||
void MovieDrawViewElem(PyMOLGlobals *G, BlockRect *rect,int frames ORTHOCGOARG); | void MovieDrawViewElem(PyMOLGlobals *G, BlockRect *rect,int frames ORTHOCGOARG); | |||
skipping to change at line 64 | skipping to change at line 64 | |||
#define cMovieStop 0 | #define cMovieStop 0 | |||
#define cMoviePlay 1 | #define cMoviePlay 1 | |||
#define cMovieToggle -1 | #define cMovieToggle -1 | |||
void MoviePlay(PyMOLGlobals * G, int cmd); | void MoviePlay(PyMOLGlobals * G, int cmd); | |||
int MoviePlaying(PyMOLGlobals * G); | int MoviePlaying(PyMOLGlobals * G); | |||
void MovieSetSize(PyMOLGlobals * G, unsigned int width, unsigned int height); | void MovieSetSize(PyMOLGlobals * G, unsigned int width, unsigned int height); | |||
void MovieClearImages(PyMOLGlobals * G); | void MovieClearImages(PyMOLGlobals * G); | |||
ImageType *MovieGetImage(PyMOLGlobals * G, int image); | //Return copy of Image | |||
void MovieSetImage(PyMOLGlobals * G, int index, ImageType * image); | std::shared_ptr<pymol::Image> MovieGetImage(PyMOLGlobals * G, int index); | |||
void MovieSetImage(PyMOLGlobals * G, int index, std::shared_ptr<pymol::Image> im | ||||
age); | ||||
int MovieGetLength(PyMOLGlobals * G); | int MovieGetLength(PyMOLGlobals * G); | |||
int MovieGetPanelHeight(PyMOLGlobals * G); | int MovieGetPanelHeight(PyMOLGlobals * G); | |||
int MovieFrameToImage(PyMOLGlobals * G, int frame); | int MovieFrameToImage(PyMOLGlobals * G, int frame); | |||
int MovieFrameToIndex(PyMOLGlobals * G, int frame); | int MovieFrameToIndex(PyMOLGlobals * G, int frame); | |||
int MovieLocked(PyMOLGlobals * G); | int MovieLocked(PyMOLGlobals * G); | |||
void MovieSetLock(PyMOLGlobals * G, int); | void MovieSetLock(PyMOLGlobals * G, int); | |||
int MovieDefined(PyMOLGlobals * G); | int MovieDefined(PyMOLGlobals * G); | |||
int MovieView(PyMOLGlobals * G, int action, int first, | int MovieView(PyMOLGlobals * G, int action, int first, | |||
int last, float power, float bias, | int last, float power, float bias, | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added |