removed dependency of appcore-efl

Change-Id: I5cf0903944e587f3108b76ee43e4eaba92c7e405

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b80b61c..52b72df 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog glib-2.0 mm-common libtbm capi-media-tool gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 capi-system-info" )
+SET(dependents "dlog glib-2.0 mm-common libtbm capi-media-tool iniparser gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 capi-system-info" )
 SET(pc_dependents "capi-base-common capi-media-tool gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0" )
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 99af600..5437140 100755 (executable)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(mm-common)
 BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(capi-media-tool)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(gstreamer-1.0)

diff --git a/src/media_codec_ini.c b/src/media_codec_ini.c
index 676ae83..b9d4d14 100644 (file)
--- a/src/media_codec_ini.c
+++ b/src/media_codec_ini.c
@@ -23,7 +23,7 @@
 #include <glib/gstdio.h>
 #include <mm_debug.h>
 #include <mm_error.h>
-#include "iniparser.h"
+#include <iniparser.h>
 #include <media_codec_ini.h>
 #include <media_codec_port.h>
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index de10cdc..5d65e75 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,8 +6,7 @@ INCLUDE_DIRECTORIES(../include/headers)
 link_directories(${CMAKE_SOURCE_DIR}/../)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED appcore-efl elementary)
-#pkg_check_modules(${fw_test} REQUIRED appcore-efl elementary capi-media-camera capi-mediademuxer capi-mediamuxer)
+#pkg_check_modules(${fw_test} REQUIRED capi-media-camera capi-mediademuxer capi-mediamuxer)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/test/media_codec_test.c b/test/media_codec_test.c
index 64491d5..a542c46 100644 (file)
--- a/test/media_codec_test.c
+++ b/test/media_codec_test.c
@@ -17,8 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <glib.h>
-#include <Elementary.h>
-#include <appcore-efl.h>
 #include <gst/gst.h>
 #include <limits.h>
 
@@ -184,10 +182,7 @@ struct _App {
        /* Render */
        guint w;
        guint h;
-       Evas_Object *win;
-       Evas_Object *img;
        media_packet_h packet;
-       Ecore_Pipe *pipe;
        GList *packet_list;
        GMutex lock;
 
@@ -203,8 +198,6 @@ media_format_h fmt = NULL;
 media_packet_pool_h pkt_pool = NULL;
 
 /* Internal Functions */
-gint _create_app(void *data);
-gint _terminate_app(void *data);
 void displaymenu(void);
 void display_sub_basic();
 
@@ -223,30 +216,6 @@ void (*extractor)(App *app, guint8** data, gint *size, gboolean *have_frame, gbo
 
 gint g_menu_state = CURRENT_STATUS_MAINMENU;
 
-gint _create_app(void *data)
-{
-       g_print("My app is going alive!\n");
-       App *app = (App*)data;
-
-       g_mutex_init(&app->lock);
-       return 0;
-}
-
-gint _terminate_app(void *data)
-{
-       g_print("My app is going gone!\n");
-       App *app = (App*)data;
-
-       g_mutex_clear(&app->lock);
-       return 0;
-}
-
-
-struct appcore_ops ops = {
-       .create = _create_app,
-       .terminate = _terminate_app,
-};
-
 static const guint mp3types_bitrates[2][3][16] = {
        {
                {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,},
@@ -1941,6 +1910,7 @@ void input_filepath(char *filename, App *app)
 
 void quit_program(App *app)
 {
+               g_mutex_clear(&app->lock);
                media_format_unref(fmt);
                g_main_loop_quit(app->loop);
                exit(0);
@@ -2579,12 +2549,12 @@ int main(int argc, char *argv[])
 
        App *app = &s_app;
 
+       g_mutex_init(&app->lock);
        displaymenu();
        app->loop = g_main_loop_new(NULL, TRUE);
        app->timer = g_timer_new();
        g_main_loop_run(app->loop);
 
-       ops.data = app;
 
-       return appcore_efl_main(PACKAGE, &argc, &argv, &ops);
+       return 0;
 }