efl/emotion: remove init/shutdown from module, it's a subfunction of open/close!

SVN revision: 82600

diff --git a/src/lib/emotion/Emotion_Module.h b/src/lib/emotion/Emotion_Module.h
index 0dc9f99..56c9872 100644 (file)
--- a/src/lib/emotion/Emotion_Module.h
+++ b/src/lib/emotion/Emotion_Module.h
@@ -44,8 +44,6 @@ struct _Eina_Emotion_Plugins
 
 struct _Emotion_Video_Module
 {
-   unsigned char  (*init) (Evas_Object *obj, void **video, Emotion_Module_Options *opt);
-   int            (*shutdown) (void *video);
    unsigned char  (*file_open) (const char *file, Evas_Object *obj, void *video);
    void           (*file_close) (void *ef);
    void           (*play) (void *ef, double pos);

diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c
index 6b2c17e..58a4f01 100644 (file)
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -1702,8 +1702,6 @@ em_meta_get(void *data, int meta)
 
 static const Emotion_Video_Module em_module =
 {
-   em_init, /* init */
-   em_shutdown, /* shutdown */
    em_file_open, /* file_open */
    em_file_close, /* file_close */
    em_play, /* play */
@@ -1786,7 +1784,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
      }
 
 
-   if (!em_module.init(obj, video, opt))       {
+   if (!em_init(obj, video, opt))      {
        return EINA_FALSE;
    }
 
@@ -1797,7 +1795,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
 
 static void module_close(Emotion_Video_Module *module EINA_UNUSED, void *video)
 {
-       em_module.shutdown(video);
+   em_shutdown(video);
 }
 
 

diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c
index f1cf689..31f319e 100644 (file)
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c
@@ -210,8 +210,6 @@ static Eina_Bool _em_restart_stream(void *data);
 
 static const Emotion_Video_Module em_module =
 {
-   em_init, /* init */
-   em_shutdown, /* shutdown */
    em_file_open, /* file_open */
    em_file_close, /* file_close */
    em_play, /* play */
@@ -1365,7 +1363,7 @@ module_open(Evas_Object           *obj,
           }
      }
 
-   if (!em_module.init(obj, video, opt))
+   if (!em_init(obj, video, opt))
      return EINA_FALSE;
 
 #ifdef HAVE_ECORE_X
@@ -1437,7 +1435,7 @@ static void
 module_close(Emotion_Video_Module *module EINA_UNUSED,
              void                 *video)
 {
-   em_module.shutdown(video);
+   em_shutdown(video);
 
 #ifdef HAVE_ECORE_X
    if (_ecore_x_available)

diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c
index e02789e..b09db03 100644 (file)
--- a/src/modules/emotion/xine/emotion_xine.c
+++ b/src/modules/emotion/xine/emotion_xine.c
@@ -1535,8 +1535,6 @@ _em_get_pos_len(Emotion_Xine_Video *ev)
 
 static const Emotion_Video_Module em_module =
 {
-   em_init, /* init */
-     em_shutdown, /* shutdown */
      em_file_open, /* file_open */
      em_file_close, /* file_close */
      em_play, /* play */
@@ -1617,7 +1615,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
           }
      }
 
-   if (!em_module.init(obj, video, opt))
+   if (!em_init(obj, video, opt))
       return EINA_FALSE;
 
    *module = &em_module;
@@ -1627,7 +1625,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
 static void
 module_close(Emotion_Video_Module *module EINA_UNUSED, void *video)
 {
-   em_module.shutdown(video);
+   em_shutdown(video);
 }
 
 Eina_Bool