1.1 --- a/gmyth/src/gmyth_epg.c Tue Jan 30 20:52:35 2007 +0000
1.2 +++ b/gmyth/src/gmyth_epg.c Tue Jan 30 21:25:36 2007 +0000
1.3 @@ -189,19 +189,14 @@
1.4 gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GList **proglist,
1.5 const gint chan_num, GTimeVal *starttime, GTimeVal *endtime)
1.6 {
1.7 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.8
1.9 gchar *startts = gmyth_util_time_to_string_from_time_val(starttime);
1.10 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.11 gchar *endts = gmyth_util_time_to_string_from_time_val(endtime);
1.12 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.13 MYSQL_ROW row;
1.14 GString *querystr;
1.15
1.16 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.17 assert(gmyth_epg);
1.18
1.19 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.20 querystr = g_string_new(
1.21 "SELECT DISTINCT program.chanid, program.starttime, program.endtime, "
1.22 " program.title, program.subtitle, program.description, "
1.23 @@ -220,7 +215,6 @@
1.24 " program.starttime = oldrecstatus.starttime "
1.25 );
1.26
1.27 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.28 g_string_append_printf (querystr,
1.29 "WHERE program.chanid = %d "
1.30 " AND program.endtime >= '%s' "
1.31 @@ -228,38 +222,30 @@
1.32 " AND program.manualid = 0 ",
1.33 chan_num, startts, endts);
1.34
1.35 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.36 if (!g_strrstr(querystr->str, " GROUP BY "))
1.37 querystr = g_string_append(querystr,
1.38 " GROUP BY program.starttime, channel.channum, "
1.39 " channel.callsign, program.title ");
1.40
1.41 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.42 if (!g_strrstr(querystr->str, " LIMIT "))
1.43 querystr = g_string_append(querystr, " LIMIT 1000 ");
1.44
1.45 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.46 MYSQL_RES *res_set =
1.47 gmyth_query_process_statement(gmyth_epg->sqlquery, querystr->str);
1.48
1.49 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.50 if (res_set == NULL) {
1.51 g_warning ("[%s] msql query returned NULL MYSQL_RES", __FUNCTION__);
1.52 return -1;
1.53 }
1.54
1.55 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.56 (*proglist) = NULL;
1.57 while ((row = mysql_fetch_row (res_set)) != NULL) {
1.58
1.59 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.60 GMythProgramInfo *p = gmyth_program_info_new ();
1.61 p->chanid = g_string_new (row[0]);
1.62 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.63
1.64 p->startts = gmyth_util_string_to_time_val (row[1]);
1.65 p->endts = gmyth_util_string_to_time_val (row[2]);
1.66 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.67
1.68 p->recstartts = g_new0 (GTimeVal, 1);
1.69 p->recstartts->tv_sec = p->startts->tv_sec;
1.70 @@ -272,7 +258,6 @@
1.71 p->lastmodified = g_new0 (GTimeVal, 1);
1.72 p->lastmodified->tv_sec = p->startts->tv_sec;
1.73 p->lastmodified->tv_usec = p->startts->tv_usec;
1.74 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.75
1.76 p->title = g_string_new (row[3]);
1.77 p->subtitle = g_string_new (row[4]);
1.78 @@ -289,7 +274,6 @@
1.79 p->year = g_string_new (row[15]);
1.80 p->stars = g_ascii_strtod(row[16], NULL);
1.81
1.82 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.83 if (!row[17] || !strcmp(row[17], "")) {
1.84 p->originalAirDate = 0;
1.85 p->hasAirDate = FALSE;
1.86 @@ -298,7 +282,6 @@
1.87 p->hasAirDate = TRUE;
1.88 }
1.89
1.90 -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
1.91 p->catType = g_string_new (row[18]);
1.92
1.93 *proglist = g_list_append((*proglist), p);
2.1 --- a/gmyth/src/gmyth_programinfo.c Tue Jan 30 20:52:35 2007 +0000
2.2 +++ b/gmyth/src/gmyth_programinfo.c Tue Jan 30 21:25:36 2007 +0000
2.3 @@ -106,21 +106,18 @@
2.4 {
2.5 GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object);
2.6
2.7 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.8 if ( gmyth_program_info->chanid != NULL )
2.9 {
2.10 g_string_free( gmyth_program_info->chanid, TRUE );
2.11 gmyth_program_info->chanid = NULL;
2.12 }
2.13
2.14 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.15 /** The program start time. */
2.16 if ( gmyth_program_info->startts != NULL )
2.17 {
2.18 g_free( gmyth_program_info->startts);
2.19 gmyth_program_info->startts = NULL;
2.20 }
2.21 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.22
2.23 /** The program end time. */
2.24 if ( gmyth_program_info->endts != NULL )
2.25 @@ -128,7 +125,6 @@
2.26 g_free( gmyth_program_info->endts );
2.27 gmyth_program_info->endts = NULL;
2.28 }
2.29 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.30
2.31 /** The recording schedule start time. */
2.32 if ( gmyth_program_info->recstartts != NULL )
2.33 @@ -137,14 +133,12 @@
2.34 gmyth_program_info->recstartts = NULL;
2.35 }
2.36
2.37 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.38 /** The recording schedule end time */
2.39 if ( gmyth_program_info->recendts != NULL )
2.40 {
2.41 g_free(gmyth_program_info->recendts);
2.42 gmyth_program_info->recendts = NULL;
2.43 }
2.44 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.45
2.46 /** The program title. */
2.47 if (gmyth_program_info->title != NULL )
2.48 @@ -152,7 +146,6 @@
2.49 g_string_free(gmyth_program_info->title, TRUE);
2.50 gmyth_program_info->title = NULL;
2.51 }
2.52 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.53
2.54 /** The program subtitle. */
2.55 if (gmyth_program_info->subtitle != NULL )
2.56 @@ -160,14 +153,12 @@
2.57 g_string_free(gmyth_program_info->subtitle, TRUE );
2.58 gmyth_program_info->subtitle = NULL;
2.59 }
2.60 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.61 /** The program description. */
2.62 if ( gmyth_program_info->description != NULL )
2.63 {
2.64 g_string_free( gmyth_program_info->description, TRUE );
2.65 gmyth_program_info->description = NULL;
2.66 }
2.67 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.68
2.69 /** The program category. */
2.70 if ( gmyth_program_info->category != NULL )
2.71 @@ -175,33 +166,28 @@
2.72 g_string_free( gmyth_program_info->category, TRUE );
2.73 gmyth_program_info->category = NULL;
2.74 }
2.75 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.76
2.77 if ( gmyth_program_info->chanstr != NULL )
2.78 {
2.79 g_string_free( gmyth_program_info->chanstr, TRUE );
2.80 gmyth_program_info->chanstr = NULL;
2.81 }
2.82 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.83 if ( gmyth_program_info->chansign != NULL )
2.84 {
2.85 g_string_free( gmyth_program_info->chansign, TRUE );
2.86 gmyth_program_info->chansign = NULL;
2.87 }
2.88 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.89 /** The associated channel name. */
2.90 if ( gmyth_program_info->channame != NULL )
2.91 {
2.92 g_string_free( gmyth_program_info->channame, TRUE );
2.93 gmyth_program_info->channame = NULL;
2.94 }
2.95 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.96 if ( gmyth_program_info->chanOutputFilters != NULL )
2.97 {
2.98 g_string_free( gmyth_program_info->chanOutputFilters, TRUE );
2.99 gmyth_program_info->chanOutputFilters = NULL;
2.100 }
2.101 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.102
2.103 if ( gmyth_program_info->seriesid != NULL )
2.104 {
2.105 @@ -209,7 +195,6 @@
2.106 gmyth_program_info->chanOutputFilters = NULL;
2.107
2.108 }
2.109 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.110 /** The program unique id. */
2.111 if ( gmyth_program_info->programid != NULL )
2.112 {
2.113 @@ -217,14 +202,12 @@
2.114 gmyth_program_info->programid = NULL;
2.115
2.116 }
2.117 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.118 if ( gmyth_program_info->catType != NULL )
2.119 {
2.120 g_string_free( gmyth_program_info->catType, TRUE );
2.121 gmyth_program_info->catType = NULL;
2.122
2.123 }
2.124 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.125
2.126 if ( gmyth_program_info->sortTitle != NULL )
2.127 {
2.128 @@ -232,7 +215,6 @@
2.129 gmyth_program_info->sortTitle = NULL;
2.130
2.131 }
2.132 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.133
2.134 if ( gmyth_program_info->year != NULL )
2.135 {
2.136 @@ -240,35 +222,29 @@
2.137 gmyth_program_info->year = NULL;
2.138
2.139 }
2.140 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.141
2.142 if ( gmyth_program_info->originalAirDate != NULL )
2.143 {
2.144 g_free( gmyth_program_info->originalAirDate);
2.145 gmyth_program_info->originalAirDate = NULL;
2.146 }
2.147 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.148 if ( gmyth_program_info->lastmodified != NULL )
2.149 {
2.150 g_free( gmyth_program_info->lastmodified );
2.151 gmyth_program_info->lastmodified = NULL;
2.152
2.153 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.154 }
2.155 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.156 if (gmyth_program_info->lastInUseTime != NULL)
2.157 {
2.158 g_free( gmyth_program_info->lastInUseTime );
2.159 gmyth_program_info->lastInUseTime = NULL;
2.160 }
2.161 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.162
2.163 if ( gmyth_program_info->schedulerid != NULL )
2.164 {
2.165 g_string_free( gmyth_program_info->schedulerid, TRUE );
2.166 gmyth_program_info->schedulerid = NULL;
2.167 }
2.168 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.169
2.170 if ( gmyth_program_info->recgroup != NULL )
2.171 {
2.172 @@ -280,7 +256,6 @@
2.173 g_string_free( gmyth_program_info->playgroup, TRUE );
2.174 gmyth_program_info->playgroup = NULL;
2.175 }
2.176 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.177
2.178 /** The file name of the recorded program.*/
2.179 if ( gmyth_program_info->pathname != NULL)
2.180 @@ -288,13 +263,12 @@
2.181 g_string_free( gmyth_program_info->pathname, TRUE );
2.182 gmyth_program_info->pathname = NULL;
2.183 }
2.184 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.185 +
2.186 if ( gmyth_program_info->hostname != NULL )
2.187 {
2.188 g_string_free( gmyth_program_info->hostname, TRUE );
2.189 gmyth_program_info->hostname = NULL;
2.190 }
2.191 - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__);
2.192
2.193 G_OBJECT_CLASS (gmyth_program_info_parent_class)->dispose (object);
2.194 }
3.1 --- a/gmyth/src/gmyth_scheduler.c Tue Jan 30 20:52:35 2007 +0000
3.2 +++ b/gmyth/src/gmyth_scheduler.c Tue Jan 30 21:25:36 2007 +0000
3.3 @@ -519,15 +519,10 @@
3.4 proginfo = gmyth_program_info_new();
3.5
3.6 proginfo->chanid = g_string_new (msql_row[0]);
3.7 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.8 proginfo->startts = gmyth_util_string_to_time_val (msql_row[23]);
3.9 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.10 proginfo->endts = gmyth_util_string_to_time_val (msql_row[24]);
3.11 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.12 proginfo->recstartts = gmyth_util_string_to_time_val (msql_row[1]);
3.13 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.14 proginfo->recendts = gmyth_util_string_to_time_val (msql_row[2]);
3.15 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.16 proginfo->title = g_string_new (msql_row[3]);
3.17 proginfo->subtitle = g_string_new (msql_row[4]);
3.18 proginfo->description = g_string_new (msql_row[5]);
3.19 @@ -541,7 +536,6 @@
3.20 proginfo->programid = g_string_new (msql_row[12]);
3.21 proginfo->filesize = g_ascii_strtoull (msql_row[13], NULL, 10);
3.22
3.23 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.24 proginfo->lastmodified = gmyth_util_string_to_time_val (msql_row[14]);
3.25
3.26 proginfo->stars = g_ascii_strtod (msql_row[15], NULL);
3.27 @@ -551,7 +545,6 @@
3.28 proginfo->originalAirDate = 0;
3.29 proginfo->hasAirDate = FALSE;
3.30 } else {
3.31 - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__);
3.32 proginfo->originalAirDate = gmyth_util_string_to_time_val (msql_row[17]);
3.33 proginfo->hasAirDate = TRUE;
3.34 }