1.1 --- a/gmyth/src/gmyth_scheduler.c Wed Jan 23 20:04:22 2008 +0000
1.2 +++ b/gmyth/src/gmyth_scheduler.c Tue Jan 29 18:40:18 2008 +0000
1.3 @@ -245,8 +245,8 @@
1.4
1.5 schedule->schedule_id =
1.6 (guint) g_ascii_strtoull(row[0], NULL, 10);
1.7 - schedule->xx_program_id = g_string_new (row[1]);
1.8 - schedule->xx_channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
1.9 + schedule->program_id = g_string_new (row[1]);
1.10 + schedule->channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
1.11
1.12 /*
1.13 * generate a time_t from a time and a date db field
1.14 @@ -332,8 +332,8 @@
1.15 record = g_new0(RecordedInfo, 1);
1.16
1.17 record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
1.18 - record->xx_program_id = g_string_new (row[1]);
1.19 - record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
1.20 + record->program_id = g_string_new (row[1]);
1.21 + record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
1.22 record->start_time = gmyth_util_string_to_time_val(row[3]);
1.23 record->end_time = gmyth_util_string_to_time_val(row[5]);
1.24
1.25 @@ -390,8 +390,8 @@
1.26 if (row != NULL) {
1.27 record = g_new0(RecordedInfo, 1);
1.28 record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
1.29 - record->xx_program_id = g_string_new (row[1]);
1.30 - record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
1.31 + record->program_id = g_string_new (row[1]);
1.32 + record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
1.33 record->start_time = gmyth_util_string_to_time_val(row[3]);
1.34 record->end_time = gmyth_util_string_to_time_val(row[5]);
1.35 record->title = g_string_new(row[7]);
1.36 @@ -442,8 +442,8 @@
1.37 ScheduleInfo *info;
1.38
1.39 info = g_new0 (ScheduleInfo, 1);
1.40 - info->xx_program_id = g_string_new (program->xx_program_id->str);
1.41 - info->xx_channel_id = program->xx_channel_id;
1.42 + info->program_id = g_string_new (program->program_id->str);
1.43 + info->channel_id = program->channel_id;
1.44 info->start_time = g_new0 (GTimeVal, 1);
1.45 *info->start_time = *program->startts;
1.46 info->end_time = g_new0 (GTimeVal, 1);
1.47 @@ -500,7 +500,7 @@
1.48 query_str =
1.49 g_strdup_printf
1.50 ("SELECT callsign FROM channel WHERE chanid = %d;",
1.51 - schedule_info->xx_channel_id);
1.52 + schedule_info->channel_id);
1.53 msql_res =
1.54 gmyth_query_process_statement(scheduler->msqlquery, query_str);
1.55 if (msql_res == NULL) {
1.56 @@ -518,7 +518,7 @@
1.57
1.58 // _set_value (field, value, id);
1.59 _set_int_value(scheduler->msqlquery, "chanid",
1.60 - schedule_info->xx_channel_id, rec_id);
1.61 + schedule_info->channel_id, rec_id);
1.62 _set_value(scheduler->msqlquery, "station", station, rec_id);
1.63 _set_value(scheduler->msqlquery, "title", schedule_info->title->str,
1.64 rec_id);
1.65 @@ -813,7 +813,7 @@
1.66 if (msql_row) {
1.67 proginfo = gmyth_program_info_new();
1.68
1.69 - proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
1.70 + proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
1.71 proginfo->recstartts = gmyth_util_string_to_time_val(msql_row[1]);
1.72 proginfo->recendts = gmyth_util_string_to_time_val(msql_row[2]);
1.73
1.74 @@ -827,7 +827,7 @@
1.75 proginfo->chancommfree = (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
1.76 proginfo->chanOutputFilters = g_string_new(msql_row[10]);
1.77 proginfo->seriesid = g_string_new(msql_row[11]);
1.78 - proginfo->xx_program_id = g_string_new(msql_row[12]);
1.79 + proginfo->program_id = g_string_new(msql_row[12]);
1.80 proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
1.81
1.82 proginfo->lastmodified = gmyth_util_string_to_time_val(msql_row[14]);
1.83 @@ -961,7 +961,7 @@
1.84 if (msql_row) {
1.85 proginfo = gmyth_program_info_new();
1.86
1.87 - proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
1.88 + proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
1.89 proginfo->startts =
1.90 gmyth_util_string_to_time_val(msql_row[23]);
1.91 proginfo->endts = gmyth_util_string_to_time_val(msql_row[24]);
1.92 @@ -980,7 +980,7 @@
1.93 (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
1.94 proginfo->chanOutputFilters = g_string_new(msql_row[10]);
1.95 proginfo->seriesid = g_string_new(msql_row[11]);
1.96 - proginfo->xx_program_id = g_string_new(msql_row[12]);
1.97 + proginfo->program_id = g_string_new(msql_row[12]);
1.98 proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
1.99
1.100 proginfo->lastmodified =
1.101 @@ -1044,7 +1044,7 @@
1.102 gmyth_string_list_append_string(slist, program->subtitle); /* 1 */
1.103 gmyth_string_list_append_string(slist, program->description); /* 2 */
1.104 gmyth_string_list_append_string(slist, program->category); /* 3 */
1.105 - gmyth_string_list_append_int(slist, program->xx_channel_id); /* 4 */
1.106 + gmyth_string_list_append_int(slist, program->channel_id); /* 4 */
1.107 gmyth_string_list_append_string(slist, program->chanstr); /* 5 */
1.108 gmyth_string_list_append_string(slist, program->chansign); /* 6 */
1.109 gmyth_string_list_append_string(slist, program->channame); /* 7 */
1.110 @@ -1100,7 +1100,7 @@
1.111 gmyth_string_list_append_int(slist, program->chancommfree); /* 31 */
1.112 gmyth_string_list_append_string(slist, program->chanOutputFilters); /* 32 */
1.113 gmyth_string_list_append_string(slist, program->seriesid); /* 33 */
1.114 - gmyth_string_list_append_string(slist, program->xx_program_id); /* 34 */
1.115 + gmyth_string_list_append_string(slist, program->program_id); /* 34 */
1.116
1.117 gmyth_string_list_append_int(slist,
1.118 program->lastmodified != NULL ?
1.119 @@ -1174,8 +1174,8 @@
1.120 {
1.121 g_return_if_fail (info != NULL);
1.122
1.123 - if (info->xx_program_id)
1.124 - g_string_free (info->xx_program_id, TRUE);
1.125 + if (info->program_id)
1.126 + g_string_free (info->program_id, TRUE);
1.127
1.128 if (info->title != NULL)
1.129 g_string_free(info->title, TRUE);
1.130 @@ -1224,8 +1224,8 @@
1.131
1.132 g_return_if_fail(info != NULL);
1.133
1.134 - if (info->xx_program_id)
1.135 - g_string_free (info->xx_program_id, TRUE);
1.136 + if (info->program_id)
1.137 + g_string_free (info->program_id, TRUE);
1.138
1.139 if (info->title != NULL)
1.140 g_string_free(info->title, TRUE);