# HG changeset patch # User renatofilho # Date 1201632018 0 # Node ID 4bdd0f922b687e854d0ae369002d58be5990c9a6 # Parent 20de88fec6f4eea979dfb31d4b95fe4cfb2666e8 [svn r901] fixed var names diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_epg.c --- a/gmyth/src/gmyth_epg.c Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_epg.c Tue Jan 29 18:40:18 2008 +0000 @@ -311,7 +311,7 @@ GMythProgramInfo *p = gmyth_program_info_new(); - p->xx_channel_id = (int) g_ascii_strtoull (row[0], NULL, 10); + p->channel_id = (int) g_ascii_strtoull (row[0], NULL, 10); p->startts = gmyth_util_string_to_time_val(row[1]); p->endts = gmyth_util_string_to_time_val(row[2]); @@ -340,7 +340,7 @@ p->chancommfree = g_ascii_strtoull(row[11], NULL, 10); p->chanOutputFilters = g_string_new(row[12]); p->seriesid = g_string_new(row[13]); - p->xx_program_id = g_string_new(row[14]); + p->program_id = g_string_new(row[14]); p->year = g_string_new(row[15]); p->stars = g_ascii_strtod(row[16], NULL); diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_programinfo.c --- a/gmyth/src/gmyth_programinfo.c Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_programinfo.c Tue Jan 29 18:40:18 2008 +0000 @@ -170,9 +170,9 @@ } /** The program unique id. */ - if (gmyth_program_info->xx_program_id != NULL) { - g_string_free (gmyth_program_info->xx_program_id, TRUE); - gmyth_program_info->xx_program_id = NULL; + if (gmyth_program_info->program_id != NULL) { + g_string_free (gmyth_program_info->program_id, TRUE); + gmyth_program_info->program_id = NULL; } if (gmyth_program_info->catType != NULL) { @@ -268,7 +268,7 @@ gmyth_string_list_append_string(slist, prog->subtitle); /* 1 */ gmyth_string_list_append_string(slist, prog->description); /* 2 */ gmyth_string_list_append_string(slist, prog->category); /* 3 */ - gmyth_string_list_append_int (slist, prog->xx_channel_id); /* 4 */ + gmyth_string_list_append_int (slist, prog->channel_id); /* 4 */ gmyth_string_list_append_string(slist, prog->chanstr); /* 5 */ gmyth_string_list_append_string(slist, prog->chansign); /* 6 */ gmyth_string_list_append_string(slist, prog->channame); /* 7 */ @@ -321,7 +321,7 @@ gmyth_string_list_append_string(slist, prog->chanOutputFilters); /* 32 */ gmyth_string_list_append_string(slist, prog->seriesid); /* 33 */ - gmyth_string_list_append_string(slist, prog->xx_program_id); /* 34 */ + gmyth_string_list_append_string(slist, prog->program_id); /* 34 */ gmyth_string_list_append_char_array(slist, ""); /* 35 */ gmyth_string_list_append_int(slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0); /* 36 */// DATETIME_TO_LIST(lastmodified) @@ -362,7 +362,7 @@ prog->subtitle = gmyth_string_list_get_string(slist, pos + 1); prog->description = gmyth_string_list_get_string(slist, pos + 2); prog->category = gmyth_string_list_get_string(slist, pos + 3); - prog->xx_channel_id = gmyth_string_list_get_int (slist, pos + 4); + prog->channel_id = gmyth_string_list_get_int (slist, pos + 4); prog->channame = gmyth_string_list_get_string(slist, pos + 5); prog->chanstr = gmyth_string_list_get_string(slist, pos + 6); prog->chansign = gmyth_string_list_get_string(slist, pos + 7); @@ -413,7 +413,7 @@ prog->chanOutputFilters = gmyth_string_list_get_string(slist, pos + 32); prog->seriesid = gmyth_string_list_get_string(slist, pos + 33); - prog->xx_program_id = gmyth_string_list_get_string(slist, pos + 34); + prog->program_id = gmyth_string_list_get_string(slist, pos + 34); gmyth_string_list_get_string(slist, pos + 35); prog->lastmodified = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 36)))->str); // DATETIME_TO_LIST(lastmodified) gmyth_string_list_get_int(slist, pos + 37); // FLOAT_TO_LIST(stars) @@ -484,7 +484,7 @@ prog->channame = gmyth_string_list_get_string(slist, 6); prog->chansign = gmyth_string_list_get_string(slist, 7); prog->chanstr = gmyth_string_list_get_string(slist, 8); - prog->xx_channel_id = gmyth_string_list_get_int (slist, 9); + prog->channel_id = gmyth_string_list_get_int (slist, 9); prog->filesize = gmyth_string_list_get_int64(slist, 10); gmyth_debug @@ -532,7 +532,7 @@ gmyth_program_info_non_null_value(prog->subtitle), gmyth_program_info_non_null_value(prog->description), gmyth_program_info_non_null_value(prog->category), - prog->xx_channel_id, + prog->channel_id, gmyth_program_info_non_null_value(prog->channame), gmyth_program_info_non_null_value(prog->chanstr), gmyth_program_info_non_null_value(prog->chansign), @@ -550,7 +550,7 @@ prog->chancommfree, gmyth_program_info_non_null_value(prog->chanOutputFilters), gmyth_program_info_non_null_value(prog->seriesid), - gmyth_program_info_non_null_value(prog->xx_program_id), + gmyth_program_info_non_null_value(prog->program_id), gmyth_util_time_to_string_from_time_val(prog->lastmodified), gmyth_util_time_to_string_from_time_val(prog->originalAirDate), prog->hasAirDate, diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_programinfo.h --- a/gmyth/src/gmyth_programinfo.h Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_programinfo.h Tue Jan 29 18:40:18 2008 +0000 @@ -62,7 +62,7 @@ GObject parent; /** The channel unique ID. */ - gint xx_channel_id; + gint channel_id; /** The program start time. */ GTimeVal *startts; /** The program end time. */ @@ -90,7 +90,7 @@ GString *seriesid; /** The program unique id. */ - GString *xx_program_id; + GString *program_id; GString *catType; GString *sortTitle; diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_recorder.c --- a/gmyth/src/gmyth_recorder.c Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_recorder.c Tue Jan 29 18:40:18 2008 +0000 @@ -917,7 +917,7 @@ gmyth_string_list_append_string(str_list, tmp_str); gmyth_string_list_append_char_array(str_list, "GET_NEXT_PROGRAM_INFO"); gmyth_string_list_append_string(str_list, actual_proginfo->channame); - gmyth_string_list_append_int(str_list, actual_proginfo->xx_channel_id); + gmyth_string_list_append_int(str_list, actual_proginfo->channel_id); gmyth_string_list_append_int(str_list, direction); gmyth_string_list_append_char_array(str_list, date); diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_scheduler.c --- a/gmyth/src/gmyth_scheduler.c Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_scheduler.c Tue Jan 29 18:40:18 2008 +0000 @@ -245,8 +245,8 @@ schedule->schedule_id = (guint) g_ascii_strtoull(row[0], NULL, 10); - schedule->xx_program_id = g_string_new (row[1]); - schedule->xx_channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10); + schedule->program_id = g_string_new (row[1]); + schedule->channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10); /* * generate a time_t from a time and a date db field @@ -332,8 +332,8 @@ record = g_new0(RecordedInfo, 1); record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10); - record->xx_program_id = g_string_new (row[1]); - record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10); + record->program_id = g_string_new (row[1]); + record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10); record->start_time = gmyth_util_string_to_time_val(row[3]); record->end_time = gmyth_util_string_to_time_val(row[5]); @@ -390,8 +390,8 @@ if (row != NULL) { record = g_new0(RecordedInfo, 1); record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10); - record->xx_program_id = g_string_new (row[1]); - record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10); + record->program_id = g_string_new (row[1]); + record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10); record->start_time = gmyth_util_string_to_time_val(row[3]); record->end_time = gmyth_util_string_to_time_val(row[5]); record->title = g_string_new(row[7]); @@ -442,8 +442,8 @@ ScheduleInfo *info; info = g_new0 (ScheduleInfo, 1); - info->xx_program_id = g_string_new (program->xx_program_id->str); - info->xx_channel_id = program->xx_channel_id; + info->program_id = g_string_new (program->program_id->str); + info->channel_id = program->channel_id; info->start_time = g_new0 (GTimeVal, 1); *info->start_time = *program->startts; info->end_time = g_new0 (GTimeVal, 1); @@ -500,7 +500,7 @@ query_str = g_strdup_printf ("SELECT callsign FROM channel WHERE chanid = %d;", - schedule_info->xx_channel_id); + schedule_info->channel_id); msql_res = gmyth_query_process_statement(scheduler->msqlquery, query_str); if (msql_res == NULL) { @@ -518,7 +518,7 @@ // _set_value (field, value, id); _set_int_value(scheduler->msqlquery, "chanid", - schedule_info->xx_channel_id, rec_id); + schedule_info->channel_id, rec_id); _set_value(scheduler->msqlquery, "station", station, rec_id); _set_value(scheduler->msqlquery, "title", schedule_info->title->str, rec_id); @@ -813,7 +813,7 @@ if (msql_row) { proginfo = gmyth_program_info_new(); - proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10); + proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10); proginfo->recstartts = gmyth_util_string_to_time_val(msql_row[1]); proginfo->recendts = gmyth_util_string_to_time_val(msql_row[2]); @@ -827,7 +827,7 @@ proginfo->chancommfree = (gint) g_ascii_strtoull(msql_row[9], NULL, 10); proginfo->chanOutputFilters = g_string_new(msql_row[10]); proginfo->seriesid = g_string_new(msql_row[11]); - proginfo->xx_program_id = g_string_new(msql_row[12]); + proginfo->program_id = g_string_new(msql_row[12]); proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10); proginfo->lastmodified = gmyth_util_string_to_time_val(msql_row[14]); @@ -961,7 +961,7 @@ if (msql_row) { proginfo = gmyth_program_info_new(); - proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10); + proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10); proginfo->startts = gmyth_util_string_to_time_val(msql_row[23]); proginfo->endts = gmyth_util_string_to_time_val(msql_row[24]); @@ -980,7 +980,7 @@ (gint) g_ascii_strtoull(msql_row[9], NULL, 10); proginfo->chanOutputFilters = g_string_new(msql_row[10]); proginfo->seriesid = g_string_new(msql_row[11]); - proginfo->xx_program_id = g_string_new(msql_row[12]); + proginfo->program_id = g_string_new(msql_row[12]); proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10); proginfo->lastmodified = @@ -1044,7 +1044,7 @@ gmyth_string_list_append_string(slist, program->subtitle); /* 1 */ gmyth_string_list_append_string(slist, program->description); /* 2 */ gmyth_string_list_append_string(slist, program->category); /* 3 */ - gmyth_string_list_append_int(slist, program->xx_channel_id); /* 4 */ + gmyth_string_list_append_int(slist, program->channel_id); /* 4 */ gmyth_string_list_append_string(slist, program->chanstr); /* 5 */ gmyth_string_list_append_string(slist, program->chansign); /* 6 */ gmyth_string_list_append_string(slist, program->channame); /* 7 */ @@ -1100,7 +1100,7 @@ gmyth_string_list_append_int(slist, program->chancommfree); /* 31 */ gmyth_string_list_append_string(slist, program->chanOutputFilters); /* 32 */ gmyth_string_list_append_string(slist, program->seriesid); /* 33 */ - gmyth_string_list_append_string(slist, program->xx_program_id); /* 34 */ + gmyth_string_list_append_string(slist, program->program_id); /* 34 */ gmyth_string_list_append_int(slist, program->lastmodified != NULL ? @@ -1174,8 +1174,8 @@ { g_return_if_fail (info != NULL); - if (info->xx_program_id) - g_string_free (info->xx_program_id, TRUE); + if (info->program_id) + g_string_free (info->program_id, TRUE); if (info->title != NULL) g_string_free(info->title, TRUE); @@ -1224,8 +1224,8 @@ g_return_if_fail(info != NULL); - if (info->xx_program_id) - g_string_free (info->xx_program_id, TRUE); + if (info->program_id) + g_string_free (info->program_id, TRUE); if (info->title != NULL) g_string_free(info->title, TRUE); diff -r 20de88fec6f4 -r 4bdd0f922b68 gmyth/src/gmyth_scheduler.h --- a/gmyth/src/gmyth_scheduler.h Mon Jan 28 19:39:14 2008 +0000 +++ b/gmyth/src/gmyth_scheduler.h Tue Jan 29 18:40:18 2008 +0000 @@ -99,8 +99,8 @@ typedef struct { guint schedule_id; - gint xx_channel_id; - GString *xx_program_id; + gint channel_id; + GString *program_id; GTimeVal *start_time; GTimeVal *end_time; @@ -119,8 +119,8 @@ typedef struct { guint record_id; - gint xx_channel_id; - GString *xx_program_id; + gint channel_id; + GString *program_id; GTimeVal *start_time; GTimeVal *end_time;