Hide background image

[profile/tv/apps/native/air_livetv.git] / src / tv.c

diff --git a/src/tv.c b/src/tv.c
index 46b0321..cfd92dc 100644 (file)
--- a/src/tv.c
+++ b/src/tv.c
@@ -344,7 +344,6 @@ int tv_epg_get_program(int service_id, struct tv_program_request *request)
                        (TvServiceEpgCallback) _tv_epg_event_cb, request);
        if (r != TVS_ERROR_OK) {
                _ERR("failed to get epg get current program : %d", service_id);
-               free(request);
                return -1;
        }
 
@@ -492,10 +491,11 @@ Eina_List *tv_channel_get_list()
                        if (channel_info)
                                channel_list = eina_list_append(channel_list,
                                                channel_info);
-                       free(tvs_data);
                }
        }
 
+       tv_service_free_channel_list(tvs_list);
+
        return channel_list;
 }
 
@@ -527,10 +527,11 @@ Eina_List *tv_channel_get_favorite_list()
                        if (channel_info)
                                channel_list = eina_list_append(channel_list,
                                                channel_info);
-                       free(tvs_data);
                }
        }
 
+       tv_service_free_channel_list(tvs_list);
+
        return channel_list;
 }
 
@@ -632,12 +633,10 @@ Eina_List *tv_channel_search_by_number(long major, long minor)
                if (channel_info)
                        channel_list = eina_list_append(channel_list,
                                        channel_info);
-               free(tvs_data);
        }
 
 free:
-       if (tvs_list)
-               g_list_free(tvs_list);
+       tv_service_free_channel_list(tvs_list);
 
        g_list_foreach(filter, (GFunc) _tv_channel_free_filter, NULL);
        g_list_free(filter);
@@ -830,8 +829,7 @@ int tv_channel_direct_tune(long major, long minor)
        if (r == TVS_ERROR_OK)
                g_tv_info.viewing_locked_channel = -1;
 
-       g_list_foreach(tvs_list, (GFunc) g_free, NULL);
-       g_list_free(tvs_list);
+       tv_service_free_channel_list(tvs_list);
 
 free:
        g_list_foreach(filter, (GFunc) _tv_channel_free_filter, NULL);
@@ -1083,11 +1081,13 @@ int tv_create(void)
                goto err;
        }
 
+       /*
        r = tv_service_epg_create(&g_tv_info.epg_svc);
        if (r != TVS_ERROR_OK) {
                _ERR("failed to create epg service");
                goto err;
        }
+       */
 
        memset(&g_tv_info.history, 0, sizeof(g_tv_info.history));