fix a few warnings i get on 64bit than didnt pop up on 32, revert edje

module load api break -back to eina_bool return. add some @sinces even
if there are no docs.

SVN revision: 64751

diff --git a/legacy/edje/src/bin/edje_multisense_convert.c b/legacy/edje/src/bin/edje_multisense_convert.c
index cf74be2e3d59a1df3b05fc898da5be0ed771a749..03578e7b8cf0fe5017e73b6920fb5b5aca17d21e 100644 (file)
--- a/legacy/edje/src/bin/edje_multisense_convert.c
+++ b/legacy/edje/src/bin/edje_multisense_convert.c
@@ -156,7 +156,7 @@ _edje_multisense_encode_to_flac(char *snd_path, SF_INFO sfinfo)
    if (ok)
      {
         init_status = FLAC__stream_encoder_init_file(encoder, snd_path, NULL,
-                                                     (void *)(total_samples));
+                                                     (void *)(long)(total_samples));
         if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
           {
              ERR("ERROR: unable to initialize FLAC encoder: %s\n",

diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h
index a38b27b4c13f6ab569f6e13034f19ecfa4efee7e..2ea348889895a5f7a71db420b7eac43ac5ce4b40 100644 (file)
--- a/legacy/edje/src/lib/Edje.h
+++ b/legacy/edje/src/lib/Edje.h
@@ -615,8 +615,8 @@ typedef enum _Edje_Action_Type
    EDJE_ACTION_TYPE_FOCUS_OBJECT        = 10,
    EDJE_ACTION_TYPE_PARAM_COPY          = 11,
    EDJE_ACTION_TYPE_PARAM_SET           = 12,
-   EDJE_ACTION_TYPE_SOUND_SAMPLE        = 13,
-   EDJE_ACTION_TYPE_SOUND_TONE          = 14,
+   EDJE_ACTION_TYPE_SOUND_SAMPLE        = 13, /**< @since 1.1 */
+   EDJE_ACTION_TYPE_SOUND_TONE          = 14, /**< @since 1.1 */
    EDJE_ACTION_TYPE_LAST                = 15
 } Edje_Action_Type;
 
@@ -3801,7 +3801,7 @@ EAPI const Edje_External_Param_Info *edje_external_param_info_get   (const char
  */
    EAPI const Edje_External_Type       *edje_external_type_get         (const char *type_name);
 
-   EAPI Eina_Module            *edje_module_load                (const char *module);
+   EAPI Eina_Bool               edje_module_load                (const char *module);
    EAPI const Eina_List        *edje_available_modules_get      (void);
 
    /* perspective info for maps inside edje objects */

diff --git a/legacy/edje/src/lib/edje_module.c b/legacy/edje/src/lib/edje_module.c
index e84cb9742d1775bff70bee3eec7b7394e8fe1d07..effcee1e483be973d281a065cbbafdb97818f001 100644 (file)
--- a/legacy/edje/src/lib/edje_module.c
+++ b/legacy/edje/src/lib/edje_module.c
@@ -14,8 +14,15 @@ Eina_List *_modules_found = NULL;
 # define EDJE_MODULE_NAME "module.so"
 #endif
 
-EAPI Eina_Module *
+EAPI Eina_Bool
 edje_module_load(const char *module)
+{
+   if (_edje_module_handle_load(module)) return EINA_TRUE;
+   return EINA_FALSE;
+}
+
+Eina_Module *
+_edje_module_handle_load(const char *module)
 {
    const char *path;
    Eina_List *l;

diff --git a/legacy/edje/src/lib/edje_multisense.c b/legacy/edje/src/lib/edje_multisense.c
index 3f0044a895b855fd89b9d700eb28656650c70e60..a41db542cb5353a65bea4cfa973e5aeeb1ee80f1 100644 (file)
--- a/legacy/edje/src/lib/edje_multisense.c
+++ b/legacy/edje/src/lib/edje_multisense.c
@@ -88,7 +88,7 @@ init_multisense_environment(void)
    else
      strcpy(ms_factory, "multisense_factory");
    
-   m = edje_module_load(ms_factory);
+   m = _edje_module_handle_load(ms_factory);
    if (!m) goto err;
    
 #ifdef HAVE_LIBREMIX
@@ -197,7 +197,7 @@ static RemixBase *
 edje_remix_tone_create(Multisense_Data *msdata, Edje*ed, Edje_Tone_Action *action)
 {
    Edje_Sound_Tone *tone;
-   RemixSquareTone *square;
+   RemixSquareTone *square = NULL;
    unsigned int i;
 
    if ((!ed) || (!ed->file) || (!ed->file->sound_dir))

diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 0d58900b3840bab38784774e437adbdd7651655f..4f626b2fd9b561a2fac75633c8e94a18198dbb8f 100644 (file)
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -1908,8 +1908,9 @@ void _edje_external_recalc_apply(Edje *ed, Edje_Real_Part *ep,
 void *_edje_external_params_parse(Evas_Object *obj, const Eina_List *params);
 void _edje_external_parsed_params_free(Evas_Object *obj, void *params);
 
-EAPI void _edje_module_init();
-EAPI void _edje_module_shutdown();
+Eina_Module *_edje_module_handle_load(const char *module);
+void _edje_module_init();
+void _edje_module_shutdown();
 
 static inline Eina_Bool
 edje_program_is_strncmp(const char *str)
@@ -1936,6 +1937,7 @@ edje_program_is_strrncmp(const char *str)
    return EINA_TRUE;
 }
 
+/* used by edje_cc - private still */
 EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
 EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
 

diff --git a/legacy/edje/src/modules/eet_snd_reader/eet_snd_reader.c b/legacy/edje/src/modules/eet_snd_reader/eet_snd_reader.c
index 3df4912988ae1e4aac3f326e86b0f5be9f92fcfb..3bfa4bb360dac48a7fc25ac90d917af1a1c11571 100644 (file)
--- a/legacy/edje/src/modules/eet_snd_reader/eet_snd_reader.c
+++ b/legacy/edje/src/modules/eet_snd_reader/eet_snd_reader.c
@@ -133,7 +133,7 @@ remix_init_resampler_data(RemixEnv *env, RemixBase *base)
 static RemixBase *
 remix_eet_sndfile_create(RemixEnv *env, RemixBase *sndfile, const char *path, const char *sound_id, const double speed)
 {
-   SF_VIRTUAL_IO *eet_vio;
+   SF_VIRTUAL_IO *eet_vio = NULL;
    SndInstanceData *si;
    const void *sound_data;
    int sound_size;