# HG changeset patch # User melunko # Date 1174934561 -3600 # Node ID b0ce3c9fe7c5f372ca32f7466f714c3f55813b39 # Parent 916bec80b82c91969a4e252f560ce1fa2deb0129 [svn r455] epg interface changed again to GList instead of GSList. It is too complicated to change gmyth api at the moment. Other applications already are using it diff -r 916bec80b82c -r b0ce3c9fe7c5 gmyth/src/gmyth_epg.c --- a/gmyth/src/gmyth_epg.c Mon Mar 26 16:07:21 2007 +0100 +++ b/gmyth/src/gmyth_epg.c Mon Mar 26 19:42:41 2007 +0100 @@ -146,7 +146,7 @@ * @return The amount of channels retrieved from database, or -1 if error. */ gint -gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, GSList **glist_ptr) +gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, GList **glist_ptr) { MYSQL_RES *msql_res; @@ -173,12 +173,12 @@ #ifdef GMYTH_USE_DEBUG gmyth_channel_info_print(channel_info); #endif - (*glist_ptr) = g_slist_append ((*glist_ptr), channel_info); + (*glist_ptr) = g_list_append ((*glist_ptr), channel_info); } } mysql_free_result (msql_res); - return (!(*glist_ptr)) ? 0 : g_slist_length (*glist_ptr); + return (!(*glist_ptr)) ? 0 : g_list_length (*glist_ptr); } /** @@ -192,7 +192,7 @@ * @return The amount of channels retrieved from database, or -1 if error. */ gint -gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GSList **proglist, +gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GList **proglist, const gint chan_num, GTimeVal *starttime, GTimeVal *endtime) { @@ -290,7 +290,7 @@ p->catType = g_string_new (row[18]); - *proglist = g_slist_append((*proglist), p); + *proglist = g_list_append((*proglist), p); #ifdef GMYTH_USE_DEBUG gmyth_program_info_print (p); diff -r 916bec80b82c -r b0ce3c9fe7c5 gmyth/src/gmyth_epg.h --- a/gmyth/src/gmyth_epg.h Mon Mar 26 16:07:21 2007 +0100 +++ b/gmyth/src/gmyth_epg.h Mon Mar 26 19:42:41 2007 +0100 @@ -68,8 +68,8 @@ gboolean gmyth_epg_connect (GMythEPG *gmyth_epg, GMythBackendInfo *backend_info); gboolean gmyth_epg_disconnect (GMythEPG *gmyth_epg); -gint gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, GSList **glist_ptr); -gint gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GSList **proglist, +gint gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, GList **glist_ptr); +gint gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GList **proglist, const gint chanNum, GTimeVal *starttime, GTimeVal *endtime); #endif /*GMYTH_EPG_H_*/ diff -r 916bec80b82c -r b0ce3c9fe7c5 gmyth/src/gmyth_transcoder.c --- a/gmyth/src/gmyth_transcoder.c Mon Mar 26 16:07:21 2007 +0100 +++ b/gmyth/src/gmyth_transcoder.c Mon Mar 26 19:42:41 2007 +0100 @@ -150,7 +150,6 @@ } /** - * * gmyth_transcoder_set_output * @brief set transcoder to use output * @param value gboolean @@ -167,7 +166,6 @@ } /** - * * gmyth_transcoder_set_file * @brief set the file to transcoder * @param file filename