From beac985ab7b8c1fb62e102dee74d68fa7f3c192d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 16 Sep 2012 00:22:55 +0000 Subject: code cleanup: make local game engine functions static --- .../BlenderRoutines/BL_KetsjiEmbedStart.cpp | 6 +-- source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 2 +- .../Converter/BL_BlenderDataConversion.cpp | 46 +++++++++++----------- source/gameengine/Converter/BL_SkinDeformer.cpp | 8 ++-- source/gameengine/Expressions/EXP_C-Api.cpp | 4 +- source/gameengine/Expressions/EXP_C-Api.h | 2 +- source/gameengine/Expressions/ListValue.cpp | 8 ++-- source/gameengine/Ketsji/KX_FontObject.cpp | 10 ++--- .../gameengine/Ketsji/KX_PyConstraintBinding.cpp | 5 ++- source/gameengine/Ketsji/KX_PythonInitTypes.cpp | 4 +- source/gameengine/Ketsji/KX_PythonSeq.cpp | 2 +- source/gameengine/Ketsji/KX_Scene.cpp | 4 +- source/gameengine/Ketsji/KX_TrackToActuator.cpp | 8 ++-- source/gameengine/VideoTexture/ImageBase.cpp | 4 +- source/gameengine/VideoTexture/ImageMix.cpp | 4 +- source/gameengine/VideoTexture/ImageRender.cpp | 4 +- source/gameengine/VideoTexture/Texture.cpp | 18 ++++----- source/gameengine/VideoTexture/VideoFFmpeg.cpp | 10 ++--- source/gameengine/VideoTexture/blendVideoTex.cpp | 2 +- 19 files changed, 76 insertions(+), 75 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index c819407c81c..62bfc31b96a 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -125,8 +125,8 @@ static BlendFileData *load_game_data(char *filename) return bfd; } -int BL_KetsjiNextFrame(KX_KetsjiEngine *ketsjiengine, bContext *C, wmWindow *win, Scene *scene, ARegion *ar, - KX_BlenderKeyboardDevice* keyboarddevice, KX_BlenderMouseDevice* mousedevice, int draw_letterbox) +static int BL_KetsjiNextFrame(KX_KetsjiEngine *ketsjiengine, bContext *C, wmWindow *win, Scene *scene, ARegion *ar, + KX_BlenderKeyboardDevice* keyboarddevice, KX_BlenderMouseDevice* mousedevice, int draw_letterbox) { int exitrequested; @@ -198,7 +198,7 @@ struct BL_KetsjiNextFrameState { int draw_letterbox; } ketsjinextframestate; -int BL_KetsjiPyNextFrame(void *state0) +static int BL_KetsjiPyNextFrame(void *state0) { BL_KetsjiNextFrameState *state = (BL_KetsjiNextFrameState *) state0; return BL_KetsjiNextFrame( diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 19a84acf027..98a1aa81029 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -91,7 +91,7 @@ void BL_SwapBuffers(wmWindow *win) wm_window_swap_buffers(win); } -void DisableForText() +static void DisableForText() { glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); /* needed for texture fonts otherwise they render as wireframe */ diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 84ad12477d0..4a8541cd310 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -491,7 +491,7 @@ typedef struct MTF_localLayer { } MTF_localLayer; // ------------------------------------ -bool ConvertMaterial( +static bool ConvertMaterial( BL_Material *material, Material *mat, MTFace* tface, @@ -1535,14 +1535,14 @@ static void my_get_local_bounds(Object *ob, DerivedMesh *dm, float *center, floa ////////////////////////////////////////////////////// -void BL_CreateGraphicObjectNew(KX_GameObject* gameobj, - const MT_Point3& localAabbMin, - const MT_Point3& localAabbMax, - KX_Scene* kxscene, - bool isActive, - e_PhysicsEngine physics_engine) +static void BL_CreateGraphicObjectNew(KX_GameObject* gameobj, + const MT_Point3& localAabbMin, + const MT_Point3& localAabbMax, + KX_Scene* kxscene, + bool isActive, + e_PhysicsEngine physics_engine) { - if (gameobj->GetMeshCount() > 0) + if (gameobj->GetMeshCount() > 0) { switch (physics_engine) { @@ -1574,16 +1574,16 @@ void BL_CreateGraphicObjectNew(KX_GameObject* gameobj, } } -void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, - struct Object* blenderobject, - RAS_MeshObject* meshobj, - KX_Scene* kxscene, - int activeLayerBitInfo, - e_PhysicsEngine physics_engine, - KX_BlenderSceneConverter *converter, - bool processCompoundChildren - ) - +static void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, + struct Object* blenderobject, + RAS_MeshObject* meshobj, + KX_Scene* kxscene, + int activeLayerBitInfo, + e_PhysicsEngine physics_engine, + KX_BlenderSceneConverter *converter, + bool processCompoundChildren + ) + { //SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/ //int userigidbody = SYS_GetCommandLineInt(syshandle,"norigidbody",0); @@ -2086,7 +2086,7 @@ struct parentChildLink { #include "DNA_constraint_types.h" //XXX #include "BIF_editconstraint.h" -bPoseChannel *get_active_posechannel2 (Object *ob) +static bPoseChannel *get_active_posechannel2 (Object *ob) { bArmature *arm= (bArmature*)ob->data; bPoseChannel *pchan; @@ -2100,7 +2100,7 @@ bPoseChannel *get_active_posechannel2 (Object *ob) return NULL; } -ListBase *get_active_constraints2(Object *ob) +static ListBase *get_active_constraints2(Object *ob) { if (!ob) return NULL; @@ -2120,7 +2120,7 @@ ListBase *get_active_constraints2(Object *ob) } -void RBJconstraints(Object *ob)//not used +static void RBJconstraints(Object *ob)//not used { ListBase *conlist; bConstraint *curcon; @@ -2141,7 +2141,7 @@ void RBJconstraints(Object *ob)//not used #include "KX_IPhysicsController.h" #include "PHY_DynamicTypes.h" -KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used +static KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used for (int j=0;jGetCount();j++) { @@ -2154,7 +2154,7 @@ KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used } -KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist) +static KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist) { for (int j=0;jGetCount();j++) diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp index 47cba81798d..c508623bdb6 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.cpp +++ b/source/gameengine/Converter/BL_SkinDeformer.cpp @@ -67,7 +67,7 @@ extern "C"{ #define __NLA_DEFNORMALS //#undef __NLA_DEFNORMALS -short get_deformflags(struct Object *bmeshobj) +static short get_deformflags(struct Object *bmeshobj) { short flags = ARM_DEF_VGROUP; @@ -85,9 +85,9 @@ short get_deformflags(struct Object *bmeshobj) } BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj, - struct Object *bmeshobj, - class RAS_MeshObject *mesh, - BL_ArmatureObject* arma) + struct Object *bmeshobj, + class RAS_MeshObject *mesh, + BL_ArmatureObject* arma) : // BL_MeshDeformer(gameobj, bmeshobj, mesh), m_armobj(arma), diff --git a/source/gameengine/Expressions/EXP_C-Api.cpp b/source/gameengine/Expressions/EXP_C-Api.cpp index 763d115a840..2822fd8f6de 100644 --- a/source/gameengine/Expressions/EXP_C-Api.cpp +++ b/source/gameengine/Expressions/EXP_C-Api.cpp @@ -102,8 +102,8 @@ int EXP_IsValid(EXP_ValueHandle inval) /* assign property 'propval' to 'destinationval' */ void EXP_SetProperty(EXP_ValueHandle destinationval, - const char* propname, - EXP_ValueHandle propval) + const char *propname, + EXP_ValueHandle propval) { ((CValue*) destinationval)->SetProperty(propname,(CValue*)propval); } diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h index 6be1e57481c..4d43695f9b9 100644 --- a/source/gameengine/Expressions/EXP_C-Api.h +++ b/source/gameengine/Expressions/EXP_C-Api.h @@ -53,7 +53,7 @@ extern void EXP_ReleaseValue(EXP_ValueHandle); extern int EXP_IsValid(EXP_ValueHandle); /* assign property 'propval' to 'destinationval' */ -extern void EXP_SetProperty(EXP_ValueHandle propval,EXP_ValueHandle destinationval); +extern void EXP_SetProperty(EXP_ValueHandle destinationval, const char *propname, EXP_ValueHandle propval); /* returns NULL if property doesn't exist */ extern EXP_ValueHandle EXP_GetProperty(EXP_ValueHandle inval,const char* propname); diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index f43625a7821..ef82b9ed8cf 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -278,7 +278,7 @@ bool CListValue::IsModified() /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ -Py_ssize_t listvalue_bufferlen(PyObject* self) +static Py_ssize_t listvalue_bufferlen(PyObject* self) { CListValue *list= static_cast(BGE_PROXY_REF(self)); if (list==NULL) @@ -287,7 +287,7 @@ Py_ssize_t listvalue_bufferlen(PyObject* self) return (Py_ssize_t)list->GetCount(); } -PyObject* listvalue_buffer_item(PyObject* self, Py_ssize_t index) +static PyObject* listvalue_buffer_item(PyObject* self, Py_ssize_t index) { CListValue *list= static_cast(BGE_PROXY_REF(self)); CValue *cval; @@ -316,7 +316,7 @@ PyObject* listvalue_buffer_item(PyObject* self, Py_ssize_t index) return cval->GetProxy(); } -PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex) +static PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex) { CListValue *list= static_cast(BGE_PROXY_REF(self)); if (list==NULL) { @@ -348,7 +348,7 @@ PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex) /* just slice it into a python list... */ -PyObject* listvalue_buffer_slice(PyObject* self,Py_ssize_t ilow, Py_ssize_t ihigh) +static PyObject* listvalue_buffer_slice(PyObject* self,Py_ssize_t ilow, Py_ssize_t ihigh) { CListValue *list= static_cast(BGE_PROXY_REF(self)); if (list==NULL) { diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 931eac7a974..78134afdab0 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -52,7 +52,7 @@ extern "C" { /* proptotype */ int GetFontId(VFont *font); -std::vector split_string(STR_String str) +static std::vector split_string(STR_String str) { std::vector text = std::vector(); @@ -73,10 +73,10 @@ std::vector split_string(STR_String str) return text; } -KX_FontObject::KX_FontObject( void* sgReplicationInfo, - SG_Callbacks callbacks, - RAS_IRenderTools* rendertools, - Object *ob): +KX_FontObject::KX_FontObject(void* sgReplicationInfo, + SG_Callbacks callbacks, + RAS_IRenderTools* rendertools, + Object *ob): KX_GameObject(sgReplicationInfo, callbacks), m_object(ob), m_dpi(72), diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index 556d451cf66..6fb315d51cb 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -716,10 +716,11 @@ PyObject* initPythonConstraintBinding() return d; } - -void KX_RemovePythonConstraintBinding() +#if 0 +static void KX_RemovePythonConstraintBinding() { } +#endif void PHY_SetActiveEnvironment(class PHY_IPhysicsEnvironment* env) { diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp index 3033c534e84..4c5e10f2a04 100644 --- a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp +++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp @@ -164,9 +164,9 @@ static void PyType_Ready_ADD(PyObject *dict, PyTypeObject *tp, PyAttributeDef *a #define PyType_Ready_Attr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, NULL, i) #define PyType_Ready_AttrPtr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, n::AttributesPtr, i) -void initPyTypes(void) +static void initPyTypes(void) { - + /* * initPyObjectPlusType(BL_ActionActuator::Parents); * ..... diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index 6eadc0cbef3..5d082c8394a 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -314,7 +314,7 @@ static int KX_PythonSeq_contains(PyObject *self, PyObject *key) } /* Matches python dict.get(key, [default]) */ -PyObject* KX_PythonSeq_get(PyObject * self, PyObject *args) +static PyObject* KX_PythonSeq_get(PyObject * self, PyObject *args) { char *key; PyObject* def = Py_None; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index c1afed82b02..f77cb535eed 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -98,7 +98,7 @@ #include -void* KX_SceneReplicationFunc(SG_IObject* node,void* gameobj,void* scene) +static void *KX_SceneReplicationFunc(SG_IObject* node,void* gameobj,void* scene) { KX_GameObject* replica = ((KX_Scene*)scene)->AddNodeReplicaObject(node,(KX_GameObject*)gameobj); @@ -108,7 +108,7 @@ void* KX_SceneReplicationFunc(SG_IObject* node,void* gameobj,void* scene) return (void*)replica; } -void* KX_SceneDestructionFunc(SG_IObject* node,void* gameobj,void* scene) +static void *KX_SceneDestructionFunc(SG_IObject* node,void* gameobj,void* scene) { ((KX_Scene*)scene)->RemoveNodeDestructObject(node,(KX_GameObject*)gameobj); diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp index 99732130f83..17274159545 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp +++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp @@ -90,7 +90,7 @@ KX_TrackToActuator::KX_TrackToActuator(SCA_IObject *gameobj, /* old function from Blender */ -MT_Matrix3x3 EulToMat3(float *eul) +static MT_Matrix3x3 EulToMat3(float eul[3]) { MT_Matrix3x3 mat; float ci, cj, ch, si, sj, sh, cc, cs, sc, ss; @@ -122,7 +122,7 @@ MT_Matrix3x3 EulToMat3(float *eul) /* old function from Blender */ -void Mat3ToEulOld(MT_Matrix3x3 mat, float eul[3]) +static void Mat3ToEulOld(MT_Matrix3x3 mat, float eul[3]) { const float cy = sqrtf(mat[0][0] * mat[0][0] + mat[0][1] * mat[0][1]); @@ -141,7 +141,7 @@ void Mat3ToEulOld(MT_Matrix3x3 mat, float eul[3]) /* old function from Blender */ -void compatible_eulFast(float *eul, float *oldrot) +static void compatible_eulFast(float *eul, float *oldrot) { float dx, dy, dz; @@ -164,7 +164,7 @@ void compatible_eulFast(float *eul, float *oldrot) -MT_Matrix3x3 matrix3x3_interpol(MT_Matrix3x3 oldmat, MT_Matrix3x3 mat, int m_time) +static MT_Matrix3x3 matrix3x3_interpol(MT_Matrix3x3 oldmat, MT_Matrix3x3 mat, int m_time) { float eul[3], oldeul[3]; diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 54c1939ce6b..9333e0184ec 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -644,7 +644,7 @@ PyObject * Image_valid(PyImage * self, void * closure) } } -int Image_getbuffer(PyImage *self, Py_buffer *view, int flags) +static int Image_getbuffer(PyImage *self, Py_buffer *view, int flags) { unsigned int * image; int ret; @@ -691,7 +691,7 @@ error: } -void Image_releaseBuffer(PyImage *self, Py_buffer *buffer) +static void Image_releaseBuffer(PyImage *self, Py_buffer *buffer) { self->m_image->m_exports--; } diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp index cd8c6683a7f..3907e6c6883 100644 --- a/source/gameengine/VideoTexture/ImageMix.cpp +++ b/source/gameengine/VideoTexture/ImageMix.cpp @@ -108,7 +108,7 @@ inline ImageMix * getImageMix (PyImage * self) // python methods // get source weight -PyObject * getWeight (PyImage * self, PyObject * args) +static PyObject *getWeight (PyImage * self, PyObject * args) { // weight short weight = 0; @@ -125,7 +125,7 @@ PyObject * getWeight (PyImage * self, PyObject * args) // set source weight -PyObject * setWeight (PyImage * self, PyObject * args) +static PyObject *setWeight (PyImage *self, PyObject *args) { // get arguments char * id; diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index c8763671dd1..6d6cb770afa 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -333,7 +333,7 @@ static int ImageRender_init (PyObject * pySelf, PyObject * args, PyObject * kwds // get background color -PyObject * getBackground (PyImage * self, void * closure) +static PyObject *getBackground (PyImage *self, void *closure) { return Py_BuildValue("[BBBB]", getImageRender(self)->getBackground(0), @@ -510,7 +510,7 @@ static int ImageMirror_init (PyObject * pySelf, PyObject * args, PyObject * kwds } // get background color -PyObject * getClip (PyImage * self, void * closure) +static PyObject *getClip (PyImage *self, void *closure) { return PyFloat_FromDouble(getImageRender(self)->getClip()); } diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index a21300018eb..a189f5f9aaf 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -108,7 +108,7 @@ RAS_IPolyMaterial * getMaterial (PyObject *obj, short matID) } // get pointer to a lamp -KX_LightObject * getLamp(PyObject *obj) +static KX_LightObject *getLamp(PyObject *obj) { // if object is available if (obj == NULL) return NULL; @@ -147,7 +147,7 @@ short getMaterialID(PyObject * obj, const char *name) // Texture object allocation -PyObject * Texture_new (PyTypeObject *type, PyObject *args, PyObject *kwds) +static PyObject *Texture_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { // allocate object Texture * self = reinterpret_cast(type->tp_alloc(type, 0)); @@ -172,7 +172,7 @@ int Texture_setSource (Texture * self, PyObject * value, void * closure); // Texture object deallocation -void Texture_dealloc (Texture * self) +static void Texture_dealloc(Texture *self) { // release renderer Py_XDECREF(self->m_source); @@ -190,7 +190,7 @@ ExceptionID MaterialNotAvail; ExpDesc MaterialNotAvailDesc (MaterialNotAvail, "Texture material is not available"); // Texture object initialization -int Texture_init (Texture *self, PyObject *args, PyObject *kwds) +static int Texture_init(Texture *self, PyObject *args, PyObject *kwds) { // parameters - game object with video texture PyObject * obj = NULL; @@ -298,7 +298,7 @@ PyObject * Texture_close(Texture * self) // refresh texture -PyObject * Texture_refresh (Texture * self, PyObject * args) +static PyObject *Texture_refresh(Texture *self, PyObject *args) { // get parameter - refresh source PyObject * param; @@ -390,14 +390,14 @@ PyObject * Texture_refresh (Texture * self, PyObject * args) } // get OpenGL Bind Id -PyObject * Texture_getBindId (Texture * self, void * closure) +static PyObject *Texture_getBindId(Texture *self, void *closure) { unsigned int id = self->m_actTex; return Py_BuildValue("h", id); } // get mipmap value -PyObject * Texture_getMipmap (Texture * self, void * closure) +static PyObject *Texture_getMipmap(Texture *self, void *closure) { // return true if flag is set, otherwise false if (self->m_mipmap) Py_RETURN_TRUE; @@ -405,7 +405,7 @@ PyObject * Texture_getMipmap (Texture * self, void * closure) } // set mipmap value -int Texture_setMipmap (Texture * self, PyObject * value, void * closure) +static int Texture_setMipmap(Texture *self, PyObject *value, void *closure) { // check parameter, report failure if (value == NULL || !PyBool_Check(value)) @@ -421,7 +421,7 @@ int Texture_setMipmap (Texture * self, PyObject * value, void * closure) // get source object -PyObject * Texture_getSource (Texture * self, PyObject * value, void * closure) +static PyObject *Texture_getSource(Texture *self, PyObject *value, void *closure) { // if source exists if (self->m_source != NULL) diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 1ba944aa955..f1c92f2feb3 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -1123,13 +1123,13 @@ static int VideoFFmpeg_init (PyObject * pySelf, PyObject * args, PyObject * kwds return 0; } -PyObject * VideoFFmpeg_getPreseek (PyImage *self, void * closure) +static PyObject *VideoFFmpeg_getPreseek(PyImage *self, void *closure) { return Py_BuildValue("h", getFFmpeg(self)->getPreseek()); } // set range -int VideoFFmpeg_setPreseek (PyImage * self, PyObject * value, void * closure) +static int VideoFFmpeg_setPreseek(PyImage *self, PyObject *value, void *closure) { // check validity of parameter if (value == NULL || !PyLong_Check(value)) @@ -1144,7 +1144,7 @@ int VideoFFmpeg_setPreseek (PyImage * self, PyObject * value, void * closure) } // get deinterlace -PyObject * VideoFFmpeg_getDeinterlace (PyImage * self, void * closure) +static PyObject *VideoFFmpeg_getDeinterlace(PyImage *self, void *closure) { if (getFFmpeg(self)->getDeinterlace()) Py_RETURN_TRUE; @@ -1153,7 +1153,7 @@ PyObject * VideoFFmpeg_getDeinterlace (PyImage * self, void * closure) } // set flip -int VideoFFmpeg_setDeinterlace (PyImage * self, PyObject * value, void * closure) +static int VideoFFmpeg_setDeinterlace(PyImage *self, PyObject *value, void *closure) { // check parameter, report failure if (value == NULL || !PyBool_Check(value)) @@ -1269,7 +1269,7 @@ static int ImageFFmpeg_init (PyObject * pySelf, PyObject * args, PyObject * kwds return 0; } -PyObject * Image_reload (PyImage * self, PyObject *args) +static PyObject *Image_reload(PyImage *self, PyObject *args) { char * newname = NULL; if (!PyArg_ParseTuple(args, "|s:reload", &newname)) diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp index 627da57baac..b05675c880a 100644 --- a/source/gameengine/VideoTexture/blendVideoTex.cpp +++ b/source/gameengine/VideoTexture/blendVideoTex.cpp @@ -168,7 +168,7 @@ static struct PyModuleDef VideoTexture_module_def = { 0, /* m_free */ }; -PyObject* initVideoTexture(void) +static PyObject *initVideoTexture(void) { PyObject * m; -- cgit v1.2.3