diff options
author | Peter Wehrfritz <peter.wehrfritz@web.de> | 2007-11-06 17:03:43 +0000 |
---|---|---|
committer | Peter Wehrfritz <peter.wehrfritz@web.de> | 2007-11-06 17:03:43 +0000 |
commit | 4efe3eb21cbf2142b3d9cad4e0e3b36e458f41db (patch) | |
tree | 6e72df208dccf36b1913c5e9c400b12c88650375 /legacy/emotion/src/lib/emotion_smart.c | |
parent | a64803dea8879e625453d3c43624045cb284e175 (diff) |
following the api changes of ecore
SVN revision: 32411
Diffstat (limited to '')
-rw-r--r-- | legacy/emotion/src/lib/emotion_smart.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c index 7b1ded88a6..340e3feb9c 100644 --- a/legacy/emotion/src/lib/emotion_smart.c +++ b/legacy/emotion/src/lib/emotion_smart.c | |||
@@ -85,7 +85,7 @@ static void _smart_clip_unset(Evas_Object * obj); | |||
85 | /* Globals for the E Video Object */ | 85 | /* Globals for the E Video Object */ |
86 | /**********************************/ | 86 | /**********************************/ |
87 | static Evas_Smart *smart = NULL; | 87 | static Evas_Smart *smart = NULL; |
88 | static int group_id = -1; | 88 | static Ecore_Path_Group *path_group = NULL; |
89 | 89 | ||
90 | static unsigned char | 90 | static unsigned char |
91 | _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **mod, void **video) | 91 | _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **mod, void **video) |
@@ -95,13 +95,13 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module ** | |||
95 | Smart_Data *sd; | 95 | Smart_Data *sd; |
96 | 96 | ||
97 | E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); | 97 | E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); |
98 | if (group_id < 0) | 98 | if (!path_group) |
99 | group_id = ecore_path_group_new("emotion_module"); | 99 | path_group = ecore_path_group_new(); |
100 | tmp = getenv("EMOTION_MODULES_DIR"); | 100 | tmp = getenv("EMOTION_MODULES_DIR"); |
101 | if (tmp) | 101 | if (tmp) |
102 | ecore_path_group_add(group_id, tmp); | 102 | ecore_path_group_add(path_group, tmp); |
103 | ecore_path_group_add(group_id, PACKAGE_LIB_DIR"/emotion/"); | 103 | ecore_path_group_add(path_group, PACKAGE_LIB_DIR"/emotion/"); |
104 | plugin = ecore_plugin_load(group_id, name, NULL); | 104 | plugin = ecore_plugin_load(path_group, name, NULL); |
105 | if (plugin) | 105 | if (plugin) |
106 | { | 106 | { |
107 | unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module **, void **, Emotion_Module_Options *); | 107 | unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module **, void **, Emotion_Module_Options *); |
@@ -114,7 +114,7 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module ** | |||
114 | if (*mod) | 114 | if (*mod) |
115 | { | 115 | { |
116 | (*mod)->plugin = plugin; | 116 | (*mod)->plugin = plugin; |
117 | (*mod)->group_id = group_id; | 117 | (*mod)->path_group = path_group; |
118 | return 1; | 118 | return 1; |
119 | } | 119 | } |
120 | } | 120 | } |
@@ -124,8 +124,8 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module ** | |||
124 | else | 124 | else |
125 | printf ("Unable to load module %s\n", name); | 125 | printf ("Unable to load module %s\n", name); |
126 | 126 | ||
127 | if (group_id > 0) | 127 | if (path_group) |
128 | ecore_path_group_del(group_id); | 128 | ecore_path_group_del(path_group); |
129 | 129 | ||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
@@ -147,7 +147,7 @@ _emotion_module_close(Emotion_Video_Module *mod, void *video) | |||
147 | /* | 147 | /* |
148 | ecore_plugin_unload(plugin); | 148 | ecore_plugin_unload(plugin); |
149 | */ | 149 | */ |
150 | ecore_path_group_del(group_id); | 150 | ecore_path_group_del(path_group); |
151 | } | 151 | } |
152 | 152 | ||
153 | /*******************************/ | 153 | /*******************************/ |