Removed Music Chooser Warnings

Change-Id: I7d34b4c482e64a349d16be94915d3f729723527e
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/music-chooser/CMakeLists.txt b/music-chooser/CMakeLists.txt
index 04db3de..5630fba 100755 (executable)
--- a/music-chooser/CMakeLists.txt
+++ b/music-chooser/CMakeLists.txt
@@ -48,7 +48,7 @@ message("CMAKE_BINARY_DIR is ${CMAKE_BINARY_DIR}")
 
 SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wno-format-extra-args")
 SET(CMAKE_LDFLAGS "-Wl,-zdefs" )
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DMC_MUSIC_PLAYER")

diff --git a/music-chooser/layout/genlist_macro.edc b/music-chooser/layout/genlist_macro.edc
index f4c0500..aa08045 100644 (file)
--- a/music-chooser/layout/genlist_macro.edc
+++ b/music-chooser/layout/genlist_macro.edc
@@ -484,5 +484,6 @@
    text { \
       min: 0 1; \
       style: STYLE; \
+      elipsis: 1.0; \
    }
 

diff --git a/music-chooser/layout/genlist_textblock_style.edc b/music-chooser/layout/genlist_textblock_style.edc
index 92372ae..3536cd7 100644 (file)
--- a/music-chooser/layout/genlist_textblock_style.edc
+++ b/music-chooser/layout/genlist_textblock_style.edc
@@ -22,8 +22,10 @@
       tag:  "tab" "\t";\
       tag:  "b" "+ font=Tizen:style=Bold";
 
+/*
 #define STYLE_TAG_MATCH \
       tag:  "match" GENLIST_PART_MATCH_TAG_COLOR;
+*/
 
 // FIXME: Why this is needed? just don't use match color, right? damn textblock bug...
 #define STYLE_TAG_MATCH_FOCUS \

diff --git a/music-chooser/layout/mc-naviframe.edc b/music-chooser/layout/mc-naviframe.edc
index 1ac6488..22e6d0e 100644 (file)
--- a/music-chooser/layout/mc-naviframe.edc
+++ b/music-chooser/layout/mc-naviframe.edc
@@ -179,13 +179,14 @@
                   style: "naviframe_title_style";
                   size: NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
                   size_range: NAVIFRAME_TITLE_TEXT_FONT_RANGE_MIN NAVIFRAME_TITLE_TEXT_FONT_RANGE_MAX;
+                  elipsis: 1.0;
                }
                fixed: 1 1;
                rel1 { to_x: "title_text_left_padding"; to_y: "title_bg"; relative: 1.0 0.0; }
                rel2 { to_x: "title_text_right_padding"; to_y: "title_bg"; relative: 0.0 1.0; }
             }
             description { state: "subtitle_visible" 0.0;
-               text { style: "naviframe_subtitle_visible_style";}
+               text { style: "naviframe_subtitle_visible_style"; elipsis: 1.0;}
                fixed: 1 1;
                rel1 { to_x: "title_text_left_padding"; to_y: "title_top_padding"; relative: 1.0 1.0; }
                rel2 { to_x: "title_text_right_padding"; to_y: "elm.text.subtitle"; relative: 0.0 0.0; }
@@ -241,7 +242,7 @@
             mouse_events: 0;
             clip_to: "subtitle_text_clipper";
             description { state: "default" 0.0;
-               text { style: "naviframe_subtitle_style";}
+               text { style: "naviframe_subtitle_style"; elipsis: 1.0;}
                min: 0 NAVIFRAME_SUBTITLE_HEIGHT_INC;
                max: -1 NAVIFRAME_SUBTITLE_HEIGHT_INC;
                fixed: 0 1;
@@ -435,6 +436,7 @@
                   min: 1 0;
                   max: 1 0;
                   align: 1.0 0.5;
+                  elipsis: 1.0;
                }
                color_class: "T1121";
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
@@ -456,6 +458,7 @@
                   min: 1 0;
                   max: 1 0;
                   align: 0.0 0.5;
+                  elipsis: 1.0;
                }
                color_class: "T1121";
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
@@ -1933,13 +1936,13 @@
             mouse_events: 0;
             clip_to: "title_text_clipper";
             description { state: "default" 0.0;
-               text { style: "naviframe_title_style";}
+               text { style: "naviframe_title_style"; elipsis: 1.0;}
                fixed: 1 1;
                rel1 { to_x: "title_text_left_padding"; to_y: "title_bg"; relative: 1.0 0.0; }
                rel2 { to_x: "title_text_right_padding"; to_y: "title_bg"; relative: 0.0 1.0; }
             }
             description { state: "subtitle_visible" 0.0;
-               text { style: "naviframe_subtitle_visible_style";}
+               text { style: "naviframe_subtitle_visible_style"; elipsis: 1.0;}
                fixed: 1 1;
                rel1 { to_x: "title_text_left_padding"; to_y: "title_top_padding"; relative: 1.0 1.0; }
                rel2 { to_x: "title_text_right_padding"; to_y: "elm.text.subtitle"; relative: 0.0 0.0; }
@@ -1971,7 +1974,7 @@
             mouse_events: 0;
             clip_to: "subtitle_text_clipper";
             description { state: "default" 0.0;
-               text { style: "naviframe_subtitle_style";}
+               text { style: "naviframe_subtitle_style"; elipsis: 1.0;}
                min: 0 NAVIFRAME_SUBTITLE_HEIGHT_INC;
                max: -1 NAVIFRAME_SUBTITLE_HEIGHT_INC;
                fixed: 0 1;
@@ -2137,6 +2140,7 @@
                   min: 1 0;
                   max: 1 0;
                   align: 1.0 0.5;
+                  elipsis: 1.0;
                }
                color_class: "T1121";
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
@@ -2158,6 +2162,7 @@
                   min: 1 0;
                   max: 1 0;
                   align: 0.0 0.5;
+                  elipsis: 1.0;
                }
                color_class: "T1121";
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;

diff --git a/music-chooser/layout/music-chooser.edc b/music-chooser/layout/music-chooser.edc
index 592e316..56949a3 100644 (file)
--- a/music-chooser/layout/music-chooser.edc
+++ b/music-chooser/layout/music-chooser.edc
@@ -271,6 +271,7 @@ group {
                                                font: FONT_NO_CONTENT;
                                                size: FONT_NO_CONTENT_SIZE;
                                                align: 0.5 0.5;
+                                               elipsis: 1.0;
                                        }
                                }
 
@@ -376,6 +377,7 @@ group { name: "recommended_area";
                                        size: 30;
                                        min: 0 0;
                                        align: 0.0 0.5;
+                                       elipsis: 1.0;
                                }
                        }
                }
@@ -391,7 +393,7 @@ group { name: "recommended_area";
                                fixed: 0 1;
                                rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_center_h";}
                                rel2 { relative: 0.0 0.0; to_x: "padding_center_v"; to_y: "padding_bottom";}
-                               text { style: "text_unread_wrap"; }
+                               text { style: "text_unread_wrap"; elipsis: 1.0;}
                        }
                }
 
@@ -522,6 +524,7 @@ group { name: "popup_processingview_1button";
                        align: 0.0 0.5;
                        min: 0 1;
                        max: 1 1;
+                       elipsis: 1.0;
                }
                rel1 {
                        relative: 1.0 1.0;

diff --git a/music-chooser/layout/toolbar.edc b/music-chooser/layout/toolbar.edc
index 567741d..d1e01ca 100644 (file)
--- a/music-chooser/layout/toolbar.edc
+++ b/music-chooser/layout/toolbar.edc
@@ -741,6 +741,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_text_style_T1117";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"text_pressed" 0.0;
@@ -779,6 +780,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_icon_text_style_T111";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"icon_text_pressed" 0.0;
@@ -817,6 +819,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_text_style_T1117";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"icon_text_land_pressed" 0.0;
@@ -856,6 +859,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_text_style_T1117";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"text_pressed" 0.0;
@@ -894,6 +898,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_icon_text_style_T111";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"icon_text_pressed" 0.0;
@@ -932,6 +937,7 @@ group { name: "elm/toolbar/item/ntabbar";
                style: "tabbar_icon_text_style_T111";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"icon_text_land_pressed" 0.0;
@@ -2052,6 +2058,7 @@ group { name: "elm/toolbar/item/ntabbar_with_title";
                style: "tabbar_text_style_T1117";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"text_pressed" 0.0;
@@ -2083,6 +2090,7 @@ group { name: "elm/toolbar/item/ntabbar_with_title";
                style: "tabbar_text_style_T1117";
                min: 0 1;
                max: 1 0;
+               elipsis: 1.0;
             }
          }
          description { state:"icon_text_pressed" 0.0;

diff --git a/music-chooser/src/include/mc-common.h b/music-chooser/src/include/mc-common.h
index fd27628..ecfcc7d 100644 (file)
--- a/music-chooser/src/include/mc-common.h
+++ b/music-chooser/src/include/mc-common.h
@@ -38,6 +38,7 @@ char *mc_album_text_get(void *data, Evas_Object *obj, const char *part);
 char * mc_playlist_text_get(void *data, Evas_Object *obj, const char *part);
 char *mc_folder_list_label_get(void *data, Evas_Object * obj, const char *part);
 Evas_Object * mc_group_content_get(void *data, Evas_Object *obj, const char *part);
+void mc_eext_quit_cb(void *data, Evas_Object *obj, void *event_info);
 Eina_Bool mc_quit_cb(void *data, Elm_Object_Item *it);
 void mc_auto_recommended_check_cb(void *data, Evas_Object *obj, void *event_info);
 void mc_quit_select_cb(void *data, Evas_Object *obj, void *event_info);

diff --git a/music-chooser/src/include/mc-index.h b/music-chooser/src/include/mc-index.h
index 21e2411..31da99b 100644 (file)
--- a/music-chooser/src/include/mc-index.h
+++ b/music-chooser/src/include/mc-index.h
@@ -22,42 +22,6 @@
 
 typedef void (*UgMpIndexCb)(void *data);
 
-static char *non_latin_lan[] = {
-     "ar_AE.UTF-8",
-     "as_IN.UTF-8",
-     "bg_BG.UTF-8",
-     "bn_IN.UTF-8",
-     "el_GR.UTF-8",
-     "fa_IR.UTF-8",
-     "gu_IN.UTF-8",
-     "he_IL.UTF-8",
-     "hi_IN.UTF-8",
-     "hy_AM.UTF-8",
-     "ja_JP.UTF-8",
-     "ka_GE.UTF-8",
-     "kk_KZ.UTF-8",
-     "km_KH.UTF-8",
-     "kn_IN.UTF-8",
-     "ko_KR.UTF-8",
-     "lo_LA.UTF-8",
-     "mk_MK.UTF-8",
-     "ml_IN.UTF-8",
-     "mn_MN.UTF-8",
-     "mr_IN.UTF-8",
-     "ne_NP.UTF-8",
-     "or_IN.UTF-8",
-     "pa_IN.UTF-8",
-     "ru_RU.UTF-8",
-     "si_LK.UTF-8",
-     "ta_IN.UTF-8",
-     "te_IN.UTF-8",
-     "th_TH.UTF-8",
-     "uk_UA.UTF-8",
-     "ur_PK.UTF-8",
-     "zh_TW.UTF-8",
-     NULL
-};
-
 Evas_Object *mc_index_create(Evas_Object *parent, int group_type, void *data);
 void mc_index_append_item(Evas_Object *index, Evas_Object *list);
 

diff --git a/music-chooser/src/include/mc-track-list.h b/music-chooser/src/include/mc-track-list.h
index 36812a4..a202c33 100644 (file)
--- a/music-chooser/src/include/mc-track-list.h
+++ b/music-chooser/src/include/mc-track-list.h
@@ -44,11 +44,11 @@ void mc_track_list_set_uri_selected(void *thiz, const char *uri);
 int mc_track_list_update(Evas_Object *list, Elm_Object_Item *navi_it, Evas_Object *sub_view);
 int mc_track_list_get_radio();
 bool mc_widget_create_select_all_layout(Evas_Object *pParent, Evas_Smart_Cb pChangeFunc,Evas_Object_Event_Cb pMouseDownFunc, void *pUserData, Evas_Object **pCheckBox, Evas_Object **pSelectLayout);
-static void _mc_popup_view(void *data);
-static void _mc_track_list_select_cb(void *data, Evas_Object *obj, void *event_info);
-static void _mc_track_list_select_all_selected_item_data_get(void *data, Evas_Object *obj, void *event_info);
+void _mc_popup_view(void *data);
+void _mc_track_list_select_cb(void *data, Evas_Object *obj, void *event_info);
+void _mc_track_list_select_all_selected_item_data_get(void *data, Evas_Object *obj, void *event_info);
 char *mc_create_selectioninfo_text_with_count(int count);
-static unsigned int _get_select_count(void *data);
+unsigned int _get_select_count(void *data);
 
 #endif
 

diff --git a/music-chooser/src/mc-common.c b/music-chooser/src/mc-common.c
index 583bfdf..0ffba11 100755 (executable)
--- a/music-chooser/src/mc-common.c
+++ b/music-chooser/src/mc-common.c
@@ -18,9 +18,9 @@
 #include "mc-common.h"
 #include "mc-library-view.h"
 #include "mp-media-info.h"
-#include "mc-index.h"
 #include "mc-track-list.h"
 #include "mc-list-play.h"
+#include "mc-index.h"
 #include <telephony.h>
 #include <notification.h>
 #include <efl_extension.h>
@@ -33,7 +33,7 @@ static int externalStorageId = -1;
 bool detail_view = false;
 
 static Eina_Bool
-_back_cb(void *data, Evas_Object *obj, void *event_info)
+_back_cb(void *data, Elm_Object_Item *it)
 {
        startfunc;
        struct app_data *ad = data;
@@ -426,9 +426,13 @@ Evas_Object * mc_group_content_get(void *data, Evas_Object *obj, const char *par
        return content;
 }
 
-Eina_Bool
-mc_quit_cb(void *data, Elm_Object_Item *it)
-{
+void
+mc_eext_quit_cb(void *data, Evas_Object *obj, void *event_info) {
+       DEBUG_TRACE("");
+       elm_exit();
+}
+
+Eina_Bool mc_quit_cb(void *data, Elm_Object_Item *it) {
        DEBUG_TRACE("");
        elm_exit();
 

diff --git a/music-chooser/src/mc-index.c b/music-chooser/src/mc-index.c
index 618d52a..475dc31 100755 (executable)
--- a/music-chooser/src/mc-index.c
+++ b/music-chooser/src/mc-index.c
@@ -23,6 +23,42 @@
 #include "mc-track-list.h"
 #include <system_settings.h>
 
+static char *non_latin_lan[] = {
+     "ar_AE.UTF-8",
+     "as_IN.UTF-8",
+     "bg_BG.UTF-8",
+     "bn_IN.UTF-8",
+     "el_GR.UTF-8",
+     "fa_IR.UTF-8",
+     "gu_IN.UTF-8",
+     "he_IL.UTF-8",
+     "hi_IN.UTF-8",
+     "hy_AM.UTF-8",
+     "ja_JP.UTF-8",
+     "ka_GE.UTF-8",
+     "kk_KZ.UTF-8",
+     "km_KH.UTF-8",
+     "kn_IN.UTF-8",
+     "ko_KR.UTF-8",
+     "lo_LA.UTF-8",
+     "mk_MK.UTF-8",
+     "ml_IN.UTF-8",
+     "mn_MN.UTF-8",
+     "mr_IN.UTF-8",
+     "ne_NP.UTF-8",
+     "or_IN.UTF-8",
+     "pa_IN.UTF-8",
+     "ru_RU.UTF-8",
+     "si_LK.UTF-8",
+     "ta_IN.UTF-8",
+     "te_IN.UTF-8",
+     "th_TH.UTF-8",
+     "uk_UA.UTF-8",
+     "ur_PK.UTF-8",
+     "zh_TW.UTF-8",
+     NULL
+};
+
 typedef struct{
        char *first;
        Eina_Bool multiple_selection;

diff --git a/music-chooser/src/mc-library-view.c b/music-chooser/src/mc-library-view.c
index 9f14147..3bd8fee 100644 (file)
--- a/music-chooser/src/mc-library-view.c
+++ b/music-chooser/src/mc-library-view.c
@@ -67,7 +67,7 @@ static void _all_cb(void *data, Evas_Object *obj, void *event_info)
        sub_view = elm_object_part_content_unset(g_ly, "list-content");
        evas_object_del(sub_view);
 
-       MP_CHECK_NULL(g_ly);
+       MP_CHECK(g_ly);
 
        sub_view = mc_track_list_create(g_ly, ad);
        mc_track_list_set_data(sub_view, MP_TRACK_ALL, NULL, 0);
@@ -75,7 +75,7 @@ static void _all_cb(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_part_content_set(g_ly, "list-content", sub_view);
        evas_object_show(sub_view);
-       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_quit_cb, ad);
+       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_eext_quit_cb, ad);
        endfunc;
 }
 #ifdef MC_ENABLE_PLAYLIST
@@ -103,7 +103,7 @@ static void _playlist_cb(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_part_content_set(g_ly, "list-content", sub_view);
        evas_object_show(sub_view);
-       eext_object_event_callback_add(ad->navi_bar, EEXT_CALLBACK_BACK, mc_quit_cb, ad);
+       eext_object_event_callback_add(ad->navi_bar, EEXT_CALLBACK_BACK, mc_eext_quit_cb, ad);
        endfunc;
 }
 #endif
@@ -132,7 +132,7 @@ static void _artist_cb(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_part_content_set(g_ly, "list-content", sub_view);
        evas_object_show(sub_view);
-       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_quit_cb, ad);
+       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_eext_quit_cb, ad);
        endfunc;
 }
 #endif
@@ -160,7 +160,7 @@ static void _album_cb(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_part_content_set(g_ly, "list-content", sub_view);
        evas_object_show(sub_view);
-       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_quit_cb, ad);
+       eext_object_event_callback_add(sub_view, EEXT_CALLBACK_BACK, mc_eext_quit_cb, ad);
        endfunc;
 }
 
@@ -180,8 +180,6 @@ Evas_Object *_create_tabbar(Evas_Object *parent, struct app_data *ad)
        elm_toolbar_transverse_expanded_set(obj, EINA_TRUE);
        elm_toolbar_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
-       Elm_Theme* th = NULL;
-       th = elm_theme_new();
        elm_theme_extension_add(NULL, MC_EDJ_FILE);
        elm_object_style_set(obj, "scroll/tabbar");
 //     elm_object_style_set(obj, "tabbar/item_with_title");

diff --git a/music-chooser/src/mc-track-list.c b/music-chooser/src/mc-track-list.c
index 8eca956..84c9bb3 100755 (executable)
--- a/music-chooser/src/mc-track-list.c
+++ b/music-chooser/src/mc-track-list.c
@@ -19,7 +19,6 @@
 #include "mp-media-info.h"
 #include "mc-common.h"
 #include "mc-list-play.h"
-#include "mc-index.h"
 
 static int state_index = -1; //selected radio index
 static Evas_Object* g_radio_main = NULL;
@@ -93,7 +92,7 @@ _mc_track_play_btn_cb(void *data, Evas_Object * obj, const char *emission, const
 static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        list_item_data_t *it_data = data;
-       MP_CHECK_NULL(it_data);
+       MP_CHECK(it_data);
 
        it_data->checked = !it_data->checked;
        it_data->checkbox_cb = EINA_TRUE;
@@ -176,7 +175,7 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
        }
 
        if ((!strcmp(part, "elm.icon.2") && (it_data->ad->select_type == MC_SELECT_SINGLE_RINGTONE || it_data->ad->select_type == MC_SELECT_SINGLE))) { // swallow checkbox or radio button
-               if (it_data->ad->select_uri && it_data->ad->select_uri == MC_SELECT_SINGLE_RINGTONE) {
+               if (it_data->ad->select_uri && it_data->ad->select_type == MC_SELECT_SINGLE_RINGTONE) {
                        char *filepath = NULL;
                        mp_media_info_get_file_path(media, &filepath);
                        if (mc_check_file_exist(filepath) && !strcmp(it_data->ad->select_uri, filepath)) {
@@ -233,7 +232,7 @@ char *mc_create_selectioninfo_text_with_count(int count)
        startfunc;
        char *name = NULL;
     if (count > 0) {
-       name =  g_strdup_printf(GET_STR(STR_MP_SELECT_ITEMS),count);
+       name =  g_strdup_printf(GET_STR(STR_MP_SELECT_ITEMS), count);
     } else {
        name = GET_STR(MC_TEXT_SELECT);
     }
@@ -253,11 +252,8 @@ static char *_gl_select_all_text_get(void *data, Evas_Object *obj, const char *p
 static char *_gl_text_get(void *data, Evas_Object *obj, const char *part)
 {
        char *title = NULL;
-       char *prev_uri = NULL;
        char *cur_uri = NULL;
        char *uri = NULL;
-       Evas_Object *prev_part_content;
-       Evas_Object *part_content;
        bool match = false;
 
        list_item_data_t *it_data = data;
@@ -386,7 +382,7 @@ _get_media_list_count(void *data)
        endfunc;
 }
 
-static unsigned int
+unsigned int
 _get_select_count(void *data)//(Evas_Object *genlist)
 {
        startfunc;
@@ -705,7 +701,7 @@ _set_cb(void *data, Evas_Object *obj, void *event_info)
 
 }
 
-
+#if 0
 static Eina_Bool
 _back_cb(void *data, Elm_Object_Item *it)
 {
@@ -728,8 +724,9 @@ _back_cb(void *data, Elm_Object_Item *it)
 
        return EINA_FALSE;
 }
+#endif
 
-static void _mc_popup_view(void *data)
+void _mc_popup_view(void *data)
 {
        startfunc;
        track_list_data_t *ld  = data;
@@ -810,7 +807,7 @@ _done_cb(void *data, Evas_Object *obj, void *event_info)
        g_string_free(path, TRUE);
 }
 
-static void _mc_track_list_select_all_selected_item_data_get(void *data, Evas_Object *obj, void *event_info)
+void _mc_track_list_select_all_selected_item_data_get(void *data, Evas_Object *obj, void *event_info)
 {
        track_list_data_t *ld  = data;
        Elm_Object_Item *item = NULL;
@@ -862,7 +859,7 @@ static void _mc_track_list_select_all_selected_item_data_get(void *data, Evas_Ob
        }
 }
 
-static void _mc_track_list_select_cb(void *data, Evas_Object *obj, void *event_info)
+void _mc_track_list_select_cb(void *data, Evas_Object *obj, void *event_info)
 {
        startfunc;
 

diff --git a/music-chooser/src/music-chooser.c b/music-chooser/src/music-chooser.c
index 487e279..ffa7aa0 100755 (executable)
--- a/music-chooser/src/music-chooser.c
+++ b/music-chooser/src/music-chooser.c
@@ -84,7 +84,6 @@ _parse_service(struct app_data *ad, app_control_h service)
        startfunc;
        char *operation = NULL;
        char *value = NULL;
-       int ret = 0;
 
        app_control_get_operation(service, &operation);
        DEBUG_TRACE("operation: %s", operation);
@@ -93,7 +92,7 @@ _parse_service(struct app_data *ad, app_control_h service)
        {
                ad->max_count = 0;
 #if 0
-               ret = app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_COUNT, &value);
+               app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_COUNT, &value);
                if (value) {
                        ad->max_count = atoi(value);
                        DEBUG_TRACE("Maximum Count is: %d", ad->max_count);
@@ -102,14 +101,14 @@ _parse_service(struct app_data *ad, app_control_h service)
 #endif
                ad->limitsize = -1;
 #if 0
-               ret = app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_SIZE, &value);
+               app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_SIZE, &value);
                if (value) {
                        ad->limitsize = atoi(value);
                        DEBUG_TRACE("Maximum Size is: %lld", ad->limitsize);
                        IF_FREE(value);
                }
 #endif
-               ret = app_control_get_extra_data(service, MC_SELECT_MODE_KEY, &value);
+               app_control_get_extra_data(service, MC_SELECT_MODE_KEY, &value);
                DEBUG_TRACE("Operation: %s", value);
 
                if (!g_strcmp0(value, MC_SELECT_MULTIPLE)) {
@@ -276,6 +275,7 @@ mc_resume(void *data)
        return;
 }
 
+#if 0
 static void
 mc_device_orientation(app_event_info_h event_info, void *data)
 {
@@ -310,6 +310,7 @@ mc_device_orientation(app_event_info_h event_info, void *data)
 
        DEBUG_TRACE("window angle: %d", ad->win_angle);
 }
+#endif
 
 static void
 mc_destroy(void *data)
@@ -344,7 +345,6 @@ __mc_language_changed_cb(app_event_info_h event_info, void *user_data)
 {
        eventfunc;
        DEBUG_TRACE("Language changed triggered");
-       struct appdata *ad = user_data;
 
        char *lang = NULL;
        app_event_get_language(event_info, &lang);

diff --git a/res/edje/layout/mp-progressbar.edc b/res/edje/layout/mp-progressbar.edc
index f8a1a38..5f6b6a9 100755 (executable)
--- a/res/edje/layout/mp-progressbar.edc
+++ b/res/edje/layout/mp-progressbar.edc
@@ -590,6 +590,7 @@ group { name: "elm/progressbar/horizontal/wave/list_progres";
                   size: 10;
                   min: 0 0;
                   align: 0.0 0.5;
+                  elipsis: 1.0;
                }
             }
             description { state: "visible" 0.0;
@@ -643,6 +644,7 @@ group { name: "elm/progressbar/horizontal/wave/list_progres";
                   size: 10;
                   min: 0 0;
                   align: 0.5 0.0;
+                  elipsis: 1.0;
                }
                color: 0 0 0 255;
             }

diff --git a/src/common/mp-file-util.c b/src/common/mp-file-util.c
index eec98fc..55b5087 100644 (file)
--- a/src/common/mp-file-util.c
+++ b/src/common/mp-file-util.c
@@ -236,7 +236,7 @@ int mp_file_recursive_rm(const char *dir)
        DIR *dirp = NULL;
 
        if (!dir)
-               return NULL;
+               return 0;
 
        if (readlink(dir, buf, sizeof(buf)) > 0) {
                return mp_file_unlink(dir);

diff --git a/src/common/mp-media-info.c b/src/common/mp-media-info.c
index 017e454..edd4727 100755 (executable)
--- a/src/common/mp-media-info.c
+++ b/src/common/mp-media-info.c
@@ -963,7 +963,7 @@ int mp_media_info_create_by_path(mp_media_info_h *media_info, const char *file_p
 
        list->list = g_list_nth(list->list, 0);
        if (list->list == NULL) {
-               mp_media_info_destroy(list);
+               mp_media_info_list_destroy(list);
                return res;
        }
        *media_info = list->list->data;