_utils.c cleanup

Change-Id: I3dea2a04f556447375752d1c9baa27fc0785c88d

diff --git a/src/include/mm_player_utils.h b/src/include/mm_player_utils.h
index c36a1e4..4b52af1 100644 (file)
--- a/src/include/mm_player_utils.h
+++ b/src/include/mm_player_utils.h
@@ -247,8 +247,6 @@ int util_is_midi_type_by_file(const char *file_path);
 char** util_get_cookie_list ( const char *cookies );
 bool util_check_valid_url ( const char *proxy );
 const char* util_get_charset(const char *file_path);
-
-int util_get_is_connected_external_display(void);
 int util_get_pixtype(unsigned int fourcc);
 
 #ifdef __cplusplus

diff --git a/src/server/mm_player_utils.c b/src/server/mm_player_utils.c
index 937c91f..5c949f6 100644 (file)
--- a/src/server/mm_player_utils.c
+++ b/src/server/mm_player_utils.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -34,11 +33,6 @@
 #include <mm_debug.h>
 #include "mm_player_utils.h"
 
-/* for getting status of connecting external display */
-#include <vconf.h>
-#include <vconf-internal-sysman-keys.h>
-#include <vconf-internal-wifi-keys.h>
-
 int util_exist_file_path(const char *file_path)
 {
        int fd = 0;
@@ -120,7 +114,6 @@ bool util_remove_file_backup(const char *backup_path)
 }
 
 #define DETECTION_PREFIX_SIZE  20
-//bool util_is_midi_type_by_mem(void *mem, int size)
 int util_is_midi_type_by_mem(void *mem, int size)
 {
        const char *p = (const char *)mem;
@@ -162,7 +155,6 @@ int util_is_midi_type_by_mem(void *mem, int size)
        return MM_AUDIO_CODEC_INVALID;
 }
 
-//bool util_is_midi_type_by_file(const char *file_path)
 int util_is_midi_type_by_file(const char *file_path)
 {
        struct stat file_attrib;
@@ -327,7 +319,7 @@ util_get_rank_increase ( const char *factory_class )
 }
 
 int
-util_factory_rank_compare(GstPluginFeature *f1, GstPluginFeature *f2) // @
+util_factory_rank_compare(GstPluginFeature *f1, GstPluginFeature *f2)
 {
        const gchar *klass;
        int f1_rank_inc=0, f2_rank_inc=0;
@@ -411,36 +403,6 @@ done:
        return charset;
 }
 
-int
-util_get_is_connected_external_display(void)
-{
-  int is_connected_hdmi = -1;
-  int is_connected_mirroring = -1;
-
-#if 0
-       if (vconf_get_int(VCONFKEY_SYSMAN_HDMI, &is_connected_hdmi))
-               debug_error("[hdmi]vconf_set_int FAIL");
-       if (vconf_get_int(VCONFKEY_SCREEN_MIRRORING_STATE, &is_connected_mirroring))
-               debug_error("[mirroring]vconf_set_int FAIL");
-
-       /* if conneted with external display */
-       if (is_connected_mirroring == VCONFKEY_SCREEN_MIRRORING_CONNECTED) {
-               debug_warning ("connected with mirroring display");
-               return MMPLAYER_DISPLAY_MIRRORING_ACTIVE;
-       }
-       if (is_connected_hdmi == VCONFKEY_SYSMAN_HDMI_CONNECTED) {
-               debug_warning ("connected with external display");
-               return MMPLAYER_DISPLAY_HDMI_ACTIVE;
-       }
-       if ((is_connected_mirroring == VCONFKEY_SCREEN_MIRRORING_ACTIVATED || is_connected_mirroring == VCONFKEY_SCREEN_MIRRORING_DEACTIVATED) && is_connected_hdmi == VCONFKEY_SYSMAN_HDMI_DISCONNECTED) {
-               debug_warning ("non-connected status");
-               return MMPLAYER_DISPLAY_NULL;
-       }
-#endif
-       debug_error ("it is not registered (%d, %d)", is_connected_mirroring, is_connected_hdmi);
-       return -1;
-}
-
 int util_get_pixtype(unsigned int fourcc)
 {
        int pixtype = MM_PIXEL_FORMAT_INVALID;
@@ -452,7 +414,6 @@ int util_get_pixtype(unsigned int fourcc)
                         pfourcc[0], pfourcc[1], pfourcc[2], pfourcc[3]);
     */
 
-
        switch (fourcc) {
        case GST_MAKE_FOURCC ('S', 'N', '1', '2'):
        case GST_MAKE_FOURCC ('N', 'V', '1', '2'):
@@ -503,7 +464,6 @@ int util_get_pixtype(unsigned int fourcc)
        case GST_MAKE_FOURCC ('P', 'N', 'G', ' '):
                pixtype = MM_PIXEL_FORMAT_ENCODED;
                break;
-       /*FIXME*/
        case GST_MAKE_FOURCC ('I', 'T', 'L', 'V'):
                pixtype = MM_PIXEL_FORMAT_ITLV_JPEG_UYVY;
                break;