1.1 --- a/gmyth/src/gmyth_epg.c	Mon Jan 28 19:39:14 2008 +0000
     1.2 +++ b/gmyth/src/gmyth_epg.c	Tue Jan 29 18:40:18 2008 +0000
     1.3 @@ -311,7 +311,7 @@
     1.4  
     1.5          GMythProgramInfo *p = gmyth_program_info_new();
     1.6  
     1.7 -        p->xx_channel_id = (int) g_ascii_strtoull (row[0], NULL, 10);
     1.8 +        p->channel_id = (int) g_ascii_strtoull (row[0], NULL, 10);
     1.9  
    1.10          p->startts = gmyth_util_string_to_time_val(row[1]);
    1.11          p->endts = gmyth_util_string_to_time_val(row[2]);
    1.12 @@ -340,7 +340,7 @@
    1.13          p->chancommfree = g_ascii_strtoull(row[11], NULL, 10);
    1.14          p->chanOutputFilters = g_string_new(row[12]);
    1.15          p->seriesid = g_string_new(row[13]);
    1.16 -        p->xx_program_id = g_string_new(row[14]);
    1.17 +        p->program_id = g_string_new(row[14]);
    1.18          p->year = g_string_new(row[15]);
    1.19          p->stars = g_ascii_strtod(row[16], NULL);
    1.20  

     2.1 --- a/gmyth/src/gmyth_programinfo.c	Mon Jan 28 19:39:14 2008 +0000
     2.2 +++ b/gmyth/src/gmyth_programinfo.c	Tue Jan 29 18:40:18 2008 +0000
     2.3 @@ -170,9 +170,9 @@
     2.4      }
     2.5  
     2.6      /** The program unique id. */
     2.7 -    if (gmyth_program_info->xx_program_id != NULL) {
     2.8 -        g_string_free (gmyth_program_info->xx_program_id, TRUE);
     2.9 -        gmyth_program_info->xx_program_id = NULL;
    2.10 +    if (gmyth_program_info->program_id != NULL) {
    2.11 +        g_string_free (gmyth_program_info->program_id, TRUE);
    2.12 +        gmyth_program_info->program_id = NULL;
    2.13      }
    2.14  
    2.15      if (gmyth_program_info->catType != NULL) {
    2.16 @@ -268,7 +268,7 @@
    2.17      gmyth_string_list_append_string(slist, prog->subtitle); /* 1 */
    2.18      gmyth_string_list_append_string(slist, prog->description);  /* 2 */
    2.19      gmyth_string_list_append_string(slist, prog->category); /* 3 */
    2.20 -    gmyth_string_list_append_int (slist, prog->xx_channel_id);   /* 4 */
    2.21 +    gmyth_string_list_append_int (slist, prog->channel_id);   /* 4 */
    2.22      gmyth_string_list_append_string(slist, prog->chanstr);  /* 5 */
    2.23      gmyth_string_list_append_string(slist, prog->chansign); /* 6 */
    2.24      gmyth_string_list_append_string(slist, prog->channame); /* 7 */
    2.25 @@ -321,7 +321,7 @@
    2.26      gmyth_string_list_append_string(slist, prog->chanOutputFilters);    /* 32 
    2.27                                                                           */
    2.28      gmyth_string_list_append_string(slist, prog->seriesid); /* 33 */
    2.29 -    gmyth_string_list_append_string(slist, prog->xx_program_id);    /* 34 */
    2.30 +    gmyth_string_list_append_string(slist, prog->program_id);    /* 34 */
    2.31      gmyth_string_list_append_char_array(slist, ""); /* 35 */
    2.32      gmyth_string_list_append_int(slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0);   /* 36 
    2.33       */// DATETIME_TO_LIST(lastmodified)
    2.34 @@ -362,7 +362,7 @@
    2.35      prog->subtitle = gmyth_string_list_get_string(slist, pos + 1);
    2.36      prog->description = gmyth_string_list_get_string(slist, pos + 2);
    2.37      prog->category = gmyth_string_list_get_string(slist, pos + 3);
    2.38 -    prog->xx_channel_id = gmyth_string_list_get_int (slist, pos + 4);
    2.39 +    prog->channel_id = gmyth_string_list_get_int (slist, pos + 4);
    2.40      prog->channame = gmyth_string_list_get_string(slist, pos + 5);
    2.41      prog->chanstr = gmyth_string_list_get_string(slist, pos + 6);
    2.42      prog->chansign = gmyth_string_list_get_string(slist, pos + 7);
    2.43 @@ -413,7 +413,7 @@
    2.44      prog->chanOutputFilters =
    2.45          gmyth_string_list_get_string(slist, pos + 32);
    2.46      prog->seriesid = gmyth_string_list_get_string(slist, pos + 33);
    2.47 -    prog->xx_program_id = gmyth_string_list_get_string(slist, pos + 34);
    2.48 +    prog->program_id = gmyth_string_list_get_string(slist, pos + 34);
    2.49      gmyth_string_list_get_string(slist, pos + 35);
    2.50      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)
    2.51      gmyth_string_list_get_int(slist, pos + 37); // FLOAT_TO_LIST(stars)
    2.52 @@ -484,7 +484,7 @@
    2.53      prog->channame = gmyth_string_list_get_string(slist, 6);
    2.54      prog->chansign = gmyth_string_list_get_string(slist, 7);
    2.55      prog->chanstr = gmyth_string_list_get_string(slist, 8);
    2.56 -    prog->xx_channel_id = gmyth_string_list_get_int (slist, 9);
    2.57 +    prog->channel_id = gmyth_string_list_get_int (slist, 9);
    2.58      prog->filesize = gmyth_string_list_get_int64(slist, 10);
    2.59  
    2.60      gmyth_debug
    2.61 @@ -532,7 +532,7 @@
    2.62           gmyth_program_info_non_null_value(prog->subtitle),
    2.63           gmyth_program_info_non_null_value(prog->description),
    2.64           gmyth_program_info_non_null_value(prog->category),
    2.65 -         prog->xx_channel_id,
    2.66 +         prog->channel_id,
    2.67           gmyth_program_info_non_null_value(prog->channame),
    2.68           gmyth_program_info_non_null_value(prog->chanstr),
    2.69           gmyth_program_info_non_null_value(prog->chansign),
    2.70 @@ -550,7 +550,7 @@
    2.71           prog->chancommfree,
    2.72           gmyth_program_info_non_null_value(prog->chanOutputFilters),
    2.73           gmyth_program_info_non_null_value(prog->seriesid),
    2.74 -         gmyth_program_info_non_null_value(prog->xx_program_id),
    2.75 +         gmyth_program_info_non_null_value(prog->program_id),
    2.76           gmyth_util_time_to_string_from_time_val(prog->lastmodified),
    2.77           gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
    2.78           prog->hasAirDate,

     3.1 --- a/gmyth/src/gmyth_programinfo.h	Mon Jan 28 19:39:14 2008 +0000
     3.2 +++ b/gmyth/src/gmyth_programinfo.h	Tue Jan 29 18:40:18 2008 +0000
     3.3 @@ -62,7 +62,7 @@
     3.4      GObject         parent;
     3.5  
     3.6      /** The channel unique ID. */
     3.7 -    gint            xx_channel_id;
     3.8 +    gint            channel_id;
     3.9      /** The program start time. */
    3.10      GTimeVal       *startts;
    3.11      /** The program end time. */
    3.12 @@ -90,7 +90,7 @@
    3.13  
    3.14      GString        *seriesid;
    3.15      /** The program unique id. */
    3.16 -    GString        *xx_program_id;
    3.17 +    GString        *program_id;
    3.18      GString        *catType;
    3.19  
    3.20      GString        *sortTitle;

     4.1 --- a/gmyth/src/gmyth_recorder.c	Mon Jan 28 19:39:14 2008 +0000
     4.2 +++ b/gmyth/src/gmyth_recorder.c	Tue Jan 29 18:40:18 2008 +0000
     4.3 @@ -917,7 +917,7 @@
     4.4      gmyth_string_list_append_string(str_list, tmp_str);
     4.5      gmyth_string_list_append_char_array(str_list, "GET_NEXT_PROGRAM_INFO");
     4.6      gmyth_string_list_append_string(str_list, actual_proginfo->channame);
     4.7 -    gmyth_string_list_append_int(str_list, actual_proginfo->xx_channel_id);
     4.8 +    gmyth_string_list_append_int(str_list, actual_proginfo->channel_id);
     4.9      gmyth_string_list_append_int(str_list, direction);
    4.10      gmyth_string_list_append_char_array(str_list, date);
    4.11  

     5.1 --- a/gmyth/src/gmyth_scheduler.c	Mon Jan 28 19:39:14 2008 +0000
     5.2 +++ b/gmyth/src/gmyth_scheduler.c	Tue Jan 29 18:40:18 2008 +0000
     5.3 @@ -245,8 +245,8 @@
     5.4  
     5.5              schedule->schedule_id =
     5.6                  (guint) g_ascii_strtoull(row[0], NULL, 10);
     5.7 -            schedule->xx_program_id = g_string_new (row[1]);
     5.8 -            schedule->xx_channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
     5.9 +            schedule->program_id = g_string_new (row[1]);
    5.10 +            schedule->channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
    5.11  
    5.12              /*
    5.13               * generate a time_t from a time and a date db field 
    5.14 @@ -332,8 +332,8 @@
    5.15              record = g_new0(RecordedInfo, 1);
    5.16  
    5.17              record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
    5.18 -            record->xx_program_id = g_string_new (row[1]);
    5.19 -            record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
    5.20 +            record->program_id = g_string_new (row[1]);
    5.21 +            record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
    5.22              record->start_time = gmyth_util_string_to_time_val(row[3]);
    5.23              record->end_time = gmyth_util_string_to_time_val(row[5]);
    5.24  
    5.25 @@ -390,8 +390,8 @@
    5.26          if (row != NULL) {
    5.27              record = g_new0(RecordedInfo, 1);
    5.28              record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
    5.29 -            record->xx_program_id = g_string_new (row[1]);
    5.30 -            record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
    5.31 +            record->program_id = g_string_new (row[1]);
    5.32 +            record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
    5.33              record->start_time = gmyth_util_string_to_time_val(row[3]);
    5.34              record->end_time = gmyth_util_string_to_time_val(row[5]);
    5.35              record->title = g_string_new(row[7]);
    5.36 @@ -442,8 +442,8 @@
    5.37      ScheduleInfo *info;
    5.38  
    5.39      info = g_new0 (ScheduleInfo, 1);
    5.40 -    info->xx_program_id = g_string_new (program->xx_program_id->str);
    5.41 -    info->xx_channel_id = program->xx_channel_id;
    5.42 +    info->program_id = g_string_new (program->program_id->str);
    5.43 +    info->channel_id = program->channel_id;
    5.44      info->start_time = g_new0 (GTimeVal, 1);
    5.45      *info->start_time = *program->startts;
    5.46      info->end_time = g_new0 (GTimeVal, 1);
    5.47 @@ -500,7 +500,7 @@
    5.48      query_str =
    5.49          g_strdup_printf
    5.50          ("SELECT callsign FROM channel WHERE chanid = %d;",
    5.51 -         schedule_info->xx_channel_id);
    5.52 +         schedule_info->channel_id);
    5.53      msql_res =
    5.54          gmyth_query_process_statement(scheduler->msqlquery, query_str);
    5.55      if (msql_res == NULL) {
    5.56 @@ -518,7 +518,7 @@
    5.57  
    5.58      // _set_value (field, value, id);
    5.59      _set_int_value(scheduler->msqlquery, "chanid",
    5.60 -                   schedule_info->xx_channel_id, rec_id);
    5.61 +                   schedule_info->channel_id, rec_id);
    5.62      _set_value(scheduler->msqlquery, "station", station, rec_id);
    5.63      _set_value(scheduler->msqlquery, "title", schedule_info->title->str,
    5.64                 rec_id);
    5.65 @@ -813,7 +813,7 @@
    5.66          if (msql_row) {
    5.67              proginfo = gmyth_program_info_new();
    5.68  
    5.69 -            proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
    5.70 +            proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
    5.71              proginfo->recstartts = gmyth_util_string_to_time_val(msql_row[1]);
    5.72              proginfo->recendts = gmyth_util_string_to_time_val(msql_row[2]);
    5.73  
    5.74 @@ -827,7 +827,7 @@
    5.75              proginfo->chancommfree = (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
    5.76              proginfo->chanOutputFilters = g_string_new(msql_row[10]);
    5.77              proginfo->seriesid = g_string_new(msql_row[11]);
    5.78 -            proginfo->xx_program_id = g_string_new(msql_row[12]);
    5.79 +            proginfo->program_id = g_string_new(msql_row[12]);
    5.80              proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
    5.81  
    5.82              proginfo->lastmodified = gmyth_util_string_to_time_val(msql_row[14]);
    5.83 @@ -961,7 +961,7 @@
    5.84          if (msql_row) {
    5.85              proginfo = gmyth_program_info_new();
    5.86  
    5.87 -            proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
    5.88 +            proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
    5.89              proginfo->startts =
    5.90                  gmyth_util_string_to_time_val(msql_row[23]);
    5.91              proginfo->endts = gmyth_util_string_to_time_val(msql_row[24]);
    5.92 @@ -980,7 +980,7 @@
    5.93                  (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
    5.94              proginfo->chanOutputFilters = g_string_new(msql_row[10]);
    5.95              proginfo->seriesid = g_string_new(msql_row[11]);
    5.96 -            proginfo->xx_program_id = g_string_new(msql_row[12]);
    5.97 +            proginfo->program_id = g_string_new(msql_row[12]);
    5.98              proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
    5.99  
   5.100              proginfo->lastmodified =
   5.101 @@ -1044,7 +1044,7 @@
   5.102          gmyth_string_list_append_string(slist, program->subtitle);     /* 1 */
   5.103          gmyth_string_list_append_string(slist, program->description);  /* 2 */
   5.104          gmyth_string_list_append_string(slist, program->category);     /* 3 */
   5.105 -        gmyth_string_list_append_int(slist, program->xx_channel_id);   /* 4 */
   5.106 +        gmyth_string_list_append_int(slist, program->channel_id);   /* 4 */
   5.107          gmyth_string_list_append_string(slist, program->chanstr);      /* 5 */
   5.108          gmyth_string_list_append_string(slist, program->chansign);     /* 6 */
   5.109          gmyth_string_list_append_string(slist, program->channame);     /* 7 */
   5.110 @@ -1100,7 +1100,7 @@
   5.111          gmyth_string_list_append_int(slist, program->chancommfree);         /* 31 */
   5.112          gmyth_string_list_append_string(slist, program->chanOutputFilters); /* 32 */
   5.113          gmyth_string_list_append_string(slist, program->seriesid);          /* 33 */
   5.114 -        gmyth_string_list_append_string(slist, program->xx_program_id);     /* 34 */
   5.115 +        gmyth_string_list_append_string(slist, program->program_id);     /* 34 */
   5.116  
   5.117          gmyth_string_list_append_int(slist,
   5.118                                       program->lastmodified != NULL ?
   5.119 @@ -1174,8 +1174,8 @@
   5.120  {
   5.121      g_return_if_fail (info != NULL);
   5.122  
   5.123 -    if (info->xx_program_id)
   5.124 -        g_string_free (info->xx_program_id, TRUE);
   5.125 +    if (info->program_id)
   5.126 +        g_string_free (info->program_id, TRUE);
   5.127  
   5.128      if (info->title != NULL)
   5.129          g_string_free(info->title, TRUE);
   5.130 @@ -1224,8 +1224,8 @@
   5.131  
   5.132      g_return_if_fail(info != NULL);
   5.133  
   5.134 -    if (info->xx_program_id)
   5.135 -        g_string_free (info->xx_program_id, TRUE);
   5.136 +    if (info->program_id)
   5.137 +        g_string_free (info->program_id, TRUE);
   5.138  
   5.139      if (info->title != NULL)
   5.140          g_string_free(info->title, TRUE);

     6.1 --- a/gmyth/src/gmyth_scheduler.h	Mon Jan 28 19:39:14 2008 +0000
     6.2 +++ b/gmyth/src/gmyth_scheduler.h	Tue Jan 29 18:40:18 2008 +0000
     6.3 @@ -99,8 +99,8 @@
     6.4  
     6.5  typedef struct {
     6.6      guint           schedule_id;
     6.7 -    gint            xx_channel_id;
     6.8 -    GString        *xx_program_id;
     6.9 +    gint            channel_id;
    6.10 +    GString        *program_id;
    6.11  
    6.12      GTimeVal       *start_time;
    6.13      GTimeVal       *end_time;
    6.14 @@ -119,8 +119,8 @@
    6.15  
    6.16  typedef struct {
    6.17      guint           record_id;
    6.18 -    gint            xx_channel_id;
    6.19 -    GString        *xx_program_id;
    6.20 +    gint            channel_id;
    6.21 +    GString        *program_id;
    6.22  
    6.23      GTimeVal       *start_time;
    6.24      GTimeVal       *end_time;