gmyth/src/gmyth_programinfo.c
branchtrunk
changeset 387 f8eb1446ff5a
parent 356 5486e606498b
child 412 60a60397ffdf
     1.1 --- a/gmyth/src/gmyth_programinfo.c	Tue Feb 13 22:33:08 2007 +0000
     1.2 +++ b/gmyth/src/gmyth_programinfo.c	Mon Mar 05 22:18:17 2007 +0000
     1.3 @@ -28,7 +28,7 @@
     1.4   */
     1.5   
     1.6  #ifdef HAVE_CONFIG_H
     1.7 -#include "config.h"
     1.8 +    #include "config.h"
     1.9  #endif
    1.10  
    1.11  #include <stdlib.h>
    1.12 @@ -39,8 +39,8 @@
    1.13  #include "gmyth_util.h"
    1.14  #include "gmyth_debug.h"
    1.15  
    1.16 -static void gmyth_program_info_class_init          (GMythProgramInfoClass *klass);
    1.17 -static void gmyth_program_info_init                (GMythProgramInfo *object);
    1.18 +static void gmyth_program_info_class_init   (GMythProgramInfoClass *klass);
    1.19 +static void gmyth_program_info_init         (GMythProgramInfo *object);
    1.20  
    1.21  static void gmyth_program_info_dispose  (GObject *object);
    1.22  static void gmyth_program_info_finalize (GObject *object);
    1.23 @@ -52,225 +52,179 @@
    1.24  static void
    1.25  gmyth_program_info_class_init (GMythProgramInfoClass *klass)
    1.26  {
    1.27 -	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    1.28 +    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    1.29  	
    1.30 -  gobject_class->dispose  = gmyth_program_info_dispose;
    1.31 -  gobject_class->finalize = gmyth_program_info_finalize;	
    1.32 +    gobject_class->dispose  = gmyth_program_info_dispose;
    1.33 +    gobject_class->finalize = gmyth_program_info_finalize;	
    1.34  }
    1.35  
    1.36  static void
    1.37  gmyth_program_info_init (GMythProgramInfo *gmyth_program_info)
    1.38  { 
    1.39 -  gmyth_program_info->chancommfree = 0;
    1.40 +    gmyth_program_info->chancommfree = 0;
    1.41  
    1.42  	/** A flag informing if the program has video or not. */    
    1.43 -  gmyth_program_info->isVideo = FALSE;
    1.44 -  gmyth_program_info->lenMins = 0;
    1.45 +    gmyth_program_info->isVideo = FALSE;
    1.46 +    gmyth_program_info->lenMins = 0;
    1.47    
    1.48 -  gmyth_program_info->stars = 0.0f;
    1.49 -  gmyth_program_info->repeat = 0;
    1.50 +    gmyth_program_info->stars = 0.0f;
    1.51 +    gmyth_program_info->repeat = 0;
    1.52    
    1.53 -  gmyth_program_info->hasAirDate = FALSE;
    1.54 +    gmyth_program_info->hasAirDate = FALSE;
    1.55  
    1.56 -  gmyth_program_info->spread = 0;
    1.57 -  gmyth_program_info->startCol = 0;
    1.58 +    gmyth_program_info->spread = 0;
    1.59 +    gmyth_program_info->startCol = 0;
    1.60  
    1.61 -  gmyth_program_info->recpriority2 = 0;
    1.62 -  gmyth_program_info->reactivate = 0;
    1.63 +    gmyth_program_info->recpriority2 = 0;
    1.64 +    gmyth_program_info->reactivate = 0;
    1.65  
    1.66 -  gmyth_program_info->recordid = 0;
    1.67 -  gmyth_program_info->parentid = 0;   
    1.68 +    gmyth_program_info->recordid = 0;
    1.69 +    gmyth_program_info->parentid = 0;   
    1.70    
    1.71 -  /** The backend video source id associated to this program.*/
    1.72 -  gmyth_program_info->sourceid = 0;
    1.73 -  /** the backend input id associated to this program.*/
    1.74 -  gmyth_program_info->inputid = 0;
    1.75 -  /** The backend card id associated to this program.*/
    1.76 -  gmyth_program_info->cardid = 0;
    1.77 -  gmyth_program_info->shareable = FALSE;
    1.78 -  gmyth_program_info->duplicate = FALSE;
    1.79 +    /** The backend video source id associated to this program.*/
    1.80 +    gmyth_program_info->sourceid = 0;
    1.81 +    /** the backend input id associated to this program.*/
    1.82 +    gmyth_program_info->inputid = 0;
    1.83 +    /** The backend card id associated to this program.*/
    1.84 +    gmyth_program_info->cardid = 0;
    1.85 +    gmyth_program_info->shareable = FALSE;
    1.86 +    gmyth_program_info->duplicate = FALSE;
    1.87  
    1.88 -  gmyth_program_info->findid = 0;
    1.89 +    gmyth_program_info->findid = 0;
    1.90  
    1.91 -  gmyth_program_info->programflags = 0;
    1.92 -  gmyth_program_info->transcoder = 0;
    1.93 +    gmyth_program_info->programflags = 0;
    1.94 +    gmyth_program_info->transcoder = 0;
    1.95  
    1.96 -  gmyth_program_info->recpriority = 0;
    1.97 +    gmyth_program_info->recpriority = 0;
    1.98  
    1.99  	/** The file size of the recorded program.*/
   1.100 -  gmyth_program_info->filesize = -1;
   1.101 -
   1.102 -
   1.103 +    gmyth_program_info->filesize = -1;
   1.104  }
   1.105  
   1.106  static void
   1.107  gmyth_program_info_dispose  (GObject *object)
   1.108  {
   1.109 -  GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object);
   1.110 +    GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object);
   1.111  
   1.112 -	if ( gmyth_program_info->chanid != NULL )
   1.113 -	{
   1.114 +    if ( gmyth_program_info->chanid != NULL ) {
   1.115  		g_string_free( gmyth_program_info->chanid, TRUE );
   1.116  		gmyth_program_info->chanid = NULL;
   1.117 -	}
   1.118 +    }
   1.119    
   1.120 -  /** The program start time. */
   1.121 -	if ( gmyth_program_info->startts != NULL )
   1.122 -	{
   1.123 -		g_free( gmyth_program_info->startts);
   1.124 -		gmyth_program_info->startts = NULL;
   1.125 -	}
   1.126 +    /** The program start time. */
   1.127 +    g_free( gmyth_program_info->startts);
   1.128  
   1.129 -  /** The program end time. */
   1.130 -  if ( gmyth_program_info->endts != NULL )
   1.131 -  {
   1.132 +    /** The program end time. */
   1.133    	g_free( gmyth_program_info->endts );
   1.134 -  	gmyth_program_info->endts = NULL;
   1.135 -  }
   1.136    
   1.137 -  /** The recording schedule start time. */
   1.138 -  if ( gmyth_program_info->recstartts != NULL )
   1.139 -  {
   1.140 +    /** The recording schedule start time. */
   1.141    	g_free( gmyth_program_info->recstartts );
   1.142 -  	gmyth_program_info->recstartts = NULL;
   1.143 -  }
   1.144    
   1.145 -  /** The recording schedule end time */
   1.146 -  if ( gmyth_program_info->recendts != NULL )
   1.147 -  {
   1.148 +    /** The recording schedule end time */
   1.149    	g_free(gmyth_program_info->recendts);
   1.150 -  	gmyth_program_info->recendts = NULL;
   1.151 -  }
   1.152    
   1.153 -  /** The program title. */
   1.154 -  if (gmyth_program_info->title != NULL )
   1.155 -  {
   1.156 -  	g_string_free(gmyth_program_info->title, TRUE);
   1.157 -  	gmyth_program_info->title = NULL;
   1.158 -  }
   1.159 +    /** The program title. */
   1.160 +    if (gmyth_program_info->title != NULL ) {
   1.161 +        g_string_free(gmyth_program_info->title, TRUE);
   1.162 +        gmyth_program_info->title = NULL;
   1.163 +    }
   1.164    
   1.165 -  /** The program subtitle. */
   1.166 -  if (gmyth_program_info->subtitle != NULL )
   1.167 -  {
   1.168 -  	g_string_free(gmyth_program_info->subtitle, TRUE );
   1.169 -  	gmyth_program_info->subtitle = NULL;
   1.170 -  }
   1.171 -  /** The program description. */
   1.172 -  if ( gmyth_program_info->description != NULL )
   1.173 -  {
   1.174 -  	g_string_free( gmyth_program_info->description, TRUE );
   1.175 -  	gmyth_program_info->description = NULL;
   1.176 -  }
   1.177 +    /** The program subtitle. */
   1.178 +    if (gmyth_program_info->subtitle != NULL ) {
   1.179 +        g_string_free(gmyth_program_info->subtitle, TRUE );
   1.180 +        gmyth_program_info->subtitle = NULL;
   1.181 +    }
   1.182 +
   1.183 +    /** The program description. */
   1.184 +    if ( gmyth_program_info->description != NULL ) {
   1.185 +        g_string_free( gmyth_program_info->description, TRUE );
   1.186 +        gmyth_program_info->description = NULL;
   1.187 +    }
   1.188    	
   1.189 -  /** The program category. */
   1.190 -  if ( gmyth_program_info->category != NULL )
   1.191 -  {
   1.192 -  	g_string_free( gmyth_program_info->category, TRUE );
   1.193 -  	gmyth_program_info->category = NULL;
   1.194 -  }
   1.195 +    /** The program category. */
   1.196 +    if ( gmyth_program_info->category != NULL ) {
   1.197 +        g_string_free( gmyth_program_info->category, TRUE );
   1.198 +        gmyth_program_info->category = NULL;
   1.199 +    }
   1.200    
   1.201 -  if ( gmyth_program_info->chanstr != NULL )
   1.202 -  {
   1.203 -  	g_string_free( gmyth_program_info->chanstr, TRUE );
   1.204 -  	gmyth_program_info->chanstr = NULL;
   1.205 -  }
   1.206 -  if ( gmyth_program_info->chansign != NULL )
   1.207 -  {
   1.208 -  	g_string_free( gmyth_program_info->chansign, TRUE );
   1.209 -  	gmyth_program_info->chansign = NULL;
   1.210 -  }
   1.211 -  /** The associated channel name. */
   1.212 -  if ( gmyth_program_info->channame != NULL )
   1.213 -  {
   1.214 -  	g_string_free( gmyth_program_info->channame, TRUE );
   1.215 -  	gmyth_program_info->channame = NULL;
   1.216 -  }
   1.217 -  if ( gmyth_program_info->chanOutputFilters != NULL )
   1.218 -  {
   1.219 -  	g_string_free( gmyth_program_info->chanOutputFilters, TRUE );
   1.220 -  	gmyth_program_info->chanOutputFilters = NULL;
   1.221 -  }
   1.222 +    if ( gmyth_program_info->chanstr != NULL ) {
   1.223 +        g_string_free( gmyth_program_info->chanstr, TRUE );
   1.224 +        gmyth_program_info->chanstr = NULL;
   1.225 +    }
   1.226 +    
   1.227 +    if ( gmyth_program_info->chansign != NULL ) {
   1.228 +        g_string_free( gmyth_program_info->chansign, TRUE );
   1.229 +        gmyth_program_info->chansign = NULL;
   1.230 +    }
   1.231    
   1.232 -  if ( gmyth_program_info->seriesid != NULL )
   1.233 -  {
   1.234 -  	g_string_free( gmyth_program_info->seriesid, TRUE );
   1.235 -  	gmyth_program_info->chanOutputFilters = NULL;
   1.236 +    /** The associated channel name. */
   1.237 +    if ( gmyth_program_info->channame != NULL ) {
   1.238 +        g_string_free( gmyth_program_info->channame, TRUE );
   1.239 +        gmyth_program_info->channame = NULL;
   1.240 +    }
   1.241  
   1.242 -  }
   1.243 -  /** The program unique id. */
   1.244 -  if ( gmyth_program_info->programid != NULL )
   1.245 -  {
   1.246 -  	g_string_free( gmyth_program_info->programid, TRUE );
   1.247 -  	gmyth_program_info->programid = NULL;
   1.248 +    if ( gmyth_program_info->chanOutputFilters != NULL ) {
   1.249 +        g_string_free( gmyth_program_info->chanOutputFilters, TRUE );
   1.250 +        gmyth_program_info->chanOutputFilters = NULL;
   1.251 +    }
   1.252 +  
   1.253 +    if ( gmyth_program_info->seriesid != NULL ) {
   1.254 +        g_string_free( gmyth_program_info->seriesid, TRUE );
   1.255 +        gmyth_program_info->chanOutputFilters = NULL;
   1.256 +    }
   1.257 +  
   1.258 +    /** The program unique id. */
   1.259 +    if ( gmyth_program_info->programid != NULL ) {
   1.260 +        g_string_free( gmyth_program_info->programid, TRUE );
   1.261 +        gmyth_program_info->programid = NULL;
   1.262 +    }
   1.263 +  
   1.264 +    if ( gmyth_program_info->catType != NULL ) {
   1.265 +        g_string_free( gmyth_program_info->catType, TRUE );
   1.266 +        gmyth_program_info->catType = NULL;
   1.267 +    }
   1.268  
   1.269 -  }
   1.270 -  if ( gmyth_program_info->catType != NULL )
   1.271 -  {
   1.272 -  	g_string_free( gmyth_program_info->catType, TRUE );
   1.273 -  	gmyth_program_info->catType = NULL;
   1.274 +    if ( gmyth_program_info->sortTitle != NULL ) {
   1.275 +        g_string_free( gmyth_program_info->sortTitle, TRUE );
   1.276 +        gmyth_program_info->sortTitle = NULL;
   1.277 +    }
   1.278 +  
   1.279 +    if ( gmyth_program_info->year != NULL ) {
   1.280 +        g_string_free( gmyth_program_info->year, TRUE );
   1.281 +        gmyth_program_info->year = NULL;
   1.282 +    }
   1.283 +  
   1.284 +    g_free( gmyth_program_info->originalAirDate);
   1.285 +    
   1.286 +    g_free( gmyth_program_info->lastmodified );
   1.287 +  
   1.288 +    g_free( gmyth_program_info->lastInUseTime );
   1.289 +  
   1.290 +    if ( gmyth_program_info->schedulerid != NULL ) {
   1.291 +        g_string_free( gmyth_program_info->schedulerid, TRUE );
   1.292 +        gmyth_program_info->schedulerid = NULL;
   1.293 +    }
   1.294  
   1.295 -  }
   1.296 +    if ( gmyth_program_info->recgroup != NULL ) {
   1.297 +        g_string_free( gmyth_program_info->recgroup, TRUE );
   1.298 +        gmyth_program_info->recgroup = NULL;
   1.299 +    }
   1.300 +  
   1.301 +    if ( gmyth_program_info->playgroup != NULL ) {
   1.302 +        g_string_free( gmyth_program_info->playgroup, TRUE );
   1.303 +        gmyth_program_info->playgroup = NULL;
   1.304 +    }
   1.305 +  
   1.306 +    /** The file name of the recorded program.*/
   1.307 +    if ( gmyth_program_info->pathname != NULL) {
   1.308 +        g_string_free( gmyth_program_info->pathname, TRUE );
   1.309 +        gmyth_program_info->pathname = NULL;
   1.310 +    }
   1.311  
   1.312 -  if ( gmyth_program_info->sortTitle != NULL )
   1.313 -  {
   1.314 -  	g_string_free( gmyth_program_info->sortTitle, TRUE );
   1.315 -  	gmyth_program_info->sortTitle = NULL;
   1.316 -
   1.317 -  }  
   1.318 -  
   1.319 -  if ( gmyth_program_info->year != NULL )
   1.320 -  {
   1.321 -  	g_string_free( gmyth_program_info->year, TRUE );
   1.322 -  	gmyth_program_info->year = NULL;
   1.323 -
   1.324 -  }    
   1.325 -  
   1.326 -  if ( gmyth_program_info->originalAirDate != NULL )
   1.327 -  {
   1.328 -  	g_free( gmyth_program_info->originalAirDate);
   1.329 -  	gmyth_program_info->originalAirDate = NULL;
   1.330 -  }
   1.331 -  if ( gmyth_program_info->lastmodified != NULL )
   1.332 -  {
   1.333 -  	g_free( gmyth_program_info->lastmodified );
   1.334 -  	gmyth_program_info->lastmodified = NULL;
   1.335 -
   1.336 -  }
   1.337 -  if (gmyth_program_info->lastInUseTime != NULL)
   1.338 -  {
   1.339 -  	g_free( gmyth_program_info->lastInUseTime );
   1.340 -  	gmyth_program_info->lastInUseTime = NULL;
   1.341 -  }
   1.342 -  
   1.343 -  if ( gmyth_program_info->schedulerid != NULL )
   1.344 -  {
   1.345 -  	g_string_free( gmyth_program_info->schedulerid, TRUE );
   1.346 -  	gmyth_program_info->schedulerid = NULL;
   1.347 -  }
   1.348 -
   1.349 -  if ( gmyth_program_info->recgroup != NULL )
   1.350 -  {
   1.351 -  	g_string_free( gmyth_program_info->recgroup, TRUE );
   1.352 -  	gmyth_program_info->recgroup = NULL;
   1.353 -  }
   1.354 -  if ( gmyth_program_info->playgroup != NULL )
   1.355 -  {
   1.356 -  	g_string_free( gmyth_program_info->playgroup, TRUE );
   1.357 -  	gmyth_program_info->playgroup = NULL;
   1.358 -  }
   1.359 -  
   1.360 -  /** The file name of the recorded program.*/
   1.361 -  if ( gmyth_program_info->pathname != NULL)
   1.362 -  {
   1.363 -  	g_string_free( gmyth_program_info->pathname, TRUE );
   1.364 -  	gmyth_program_info->pathname = NULL;
   1.365 -  }
   1.366 -
   1.367 -  if ( gmyth_program_info->hostname != NULL )
   1.368 -  {
   1.369 -  	g_string_free( gmyth_program_info->hostname, TRUE );
   1.370 -  	gmyth_program_info->hostname = NULL;
   1.371 -  }
   1.372 +    if ( gmyth_program_info->hostname != NULL ) {
   1.373 +        g_string_free( gmyth_program_info->hostname, TRUE );
   1.374 +        gmyth_program_info->hostname = NULL;
   1.375 +    }
   1.376     
   1.377  	G_OBJECT_CLASS (gmyth_program_info_parent_class)->dispose (object);
   1.378  }
   1.379 @@ -291,7 +245,8 @@
   1.380  GMythProgramInfo*
   1.381  gmyth_program_info_new (void)
   1.382  {
   1.383 -    GMythProgramInfo *program_info = GMYTH_PROGRAM_INFO (g_object_new(GMYTH_PROGRAM_INFO_TYPE, NULL));
   1.384 +    GMythProgramInfo *program_info = 
   1.385 +        GMYTH_PROGRAM_INFO (g_object_new(GMYTH_PROGRAM_INFO_TYPE, NULL));
   1.386  
   1.387      return program_info;
   1.388  }
   1.389 @@ -320,12 +275,12 @@
   1.390      if (prog->startts)
   1.391          gmyth_string_list_append_int (slist, prog->startts->tv_sec);  /* 11 */ //DATETIME_TO_LIST(startts)
   1.392      else
   1.393 -	gmyth_string_list_append_int (slist, 0);
   1.394 +	    gmyth_string_list_append_int (slist, 0);
   1.395      
   1.396      if (prog->endts)
   1.397          gmyth_string_list_append_int (slist, prog->endts->tv_sec);  /* 12 */ //DATETIME_TO_LIST(endts)
   1.398      else
   1.399 -	gmyth_string_list_append_int (slist, 0);
   1.400 +    	gmyth_string_list_append_int (slist, 0);
   1.401  
   1.402      gmyth_string_list_append_int (slist, prog->duplicate); /* 13 */
   1.403      gmyth_string_list_append_int (slist, prog->shareable); /* 14 */
   1.404 @@ -340,8 +295,10 @@
   1.405      gmyth_string_list_append_int (slist, 0 /*prog->rectype*/); /* 23 */
   1.406      gmyth_string_list_append_int (slist, 0 /*prog->dupin*/); /* 24 */
   1.407      gmyth_string_list_append_int (slist, 0 /*prog->dupmethod*/); /* 25 */
   1.408 -    gmyth_string_list_append_int (slist, prog->recstartts != NULL ? prog->recstartts->tv_sec : 0);  /* 26 */ //DATETIME_TO_LIST(recstartts)
   1.409 -    gmyth_string_list_append_int (slist, prog->recendts != NULL ? prog->recendts->tv_sec : 0);  /* 27 */ //DATETIME_TO_LIST(recendts)
   1.410 +    gmyth_string_list_append_int (slist, 
   1.411 +            prog->recstartts != NULL ? prog->recstartts->tv_sec : 0);  /* 26 */ //DATETIME_TO_LIST(recstartts)
   1.412 +    gmyth_string_list_append_int (slist, 
   1.413 +            prog->recendts != NULL ? prog->recendts->tv_sec : 0);  /* 27 */ //DATETIME_TO_LIST(recendts)
   1.414      gmyth_string_list_append_int (slist, prog->repeat); /* 28 */
   1.415      gmyth_string_list_append_int (slist, prog->programflags); /* 29 */
   1.416      gmyth_string_list_append_char_array (slist, "Default"); /* 30 */ //prog->(recgroup != "") ? recgroup : "Default")
   1.417 @@ -350,9 +307,11 @@
   1.418      gmyth_string_list_append_string (slist, prog->seriesid); /* 33 */
   1.419      gmyth_string_list_append_string (slist, prog->programid); /* 34 */
   1.420      gmyth_string_list_append_char_array (slist, ""); /* 35 */
   1.421 -    gmyth_string_list_append_int (slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0);  /* 36 */ //DATETIME_TO_LIST(lastmodified)
   1.422 +    gmyth_string_list_append_int (slist, 
   1.423 +            prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0);  /* 36 */ //DATETIME_TO_LIST(lastmodified)
   1.424      gmyth_string_list_append_int (slist, 0);  /* 37 */ //FLOAT_TO_LIST(stars)
   1.425 -    gmyth_string_list_append_int (slist, prog->originalAirDate != NULL ? prog->originalAirDate->tv_sec : 0);  /* 38 */ //DATETIME_TO_LIST(QDateTime(originalAirDate))
   1.426 +    gmyth_string_list_append_int (slist, 
   1.427 +            prog->originalAirDate != NULL ? prog->originalAirDate->tv_sec : 0);  /* 38 */ //DATETIME_TO_LIST(QDateTime(originalAirDate))
   1.428      gmyth_string_list_append_int (slist, prog->hasAirDate); /* 39 */
   1.429      gmyth_string_list_append_char_array (slist, "Default");  /* 40 */ //prog->(playgroup != "") ? playgroup : "Default")
   1.430      gmyth_string_list_append_int (slist, prog->recpriority2); /* 41 */
   1.431 @@ -363,57 +322,14 @@
   1.432  GMythProgramInfo*
   1.433  gmyth_program_info_from_string_list ( GMythStringList *slist )
   1.434  {
   1.435 -		GMythProgramInfo *prog = gmyth_program_info_new();
   1.436 +    GMythProgramInfo *prog = gmyth_program_info_new();
   1.437  
   1.438      g_return_val_if_fail (slist != NULL, NULL);
   1.439 -    /*
   1.440 -		Unknown
   1.441 -		
   1.442 -		
   1.443 -		
   1.444 -		1000
   1.445 -		9
   1.446 -		1000
   1.447 -		Band
   1.448 -		/mnt/store//1000_20070125110059.nuv
   1.449 -		0
   1.450 -		0
   1.451 -		1169733659
   1.452 -		1169735400
   1.453 -		0
   1.454 -		0
   1.455 -		0
   1.456 -		hmelo-desktop
   1.457 -		0
   1.458 -		1
   1.459 -		0
   1.460 -		0
   1.461 -		-2
   1.462 -		0
   1.463 -		0
   1.464 -		15
   1.465 -		6
   1.466 -		1169733659
   1.467 -		1169735400
   1.468 -		0
   1.469 -		0
   1.470 -		LiveTV
   1.471 -		0
   1.472 -		
   1.473 -		
   1.474 -		
   1.475 -		1169733659
   1.476 -		0.000000
   1.477 -		-1
   1.478 -		0
   1.479 -		Default
   1.480 -		0
   1.481 -		*/
   1.482 +
   1.483      prog->title = gmyth_string_list_get_string (slist, 0);
   1.484      prog->subtitle = gmyth_string_list_get_string (slist, 1);
   1.485      prog->description = gmyth_string_list_get_string (slist, 2);
   1.486      prog->category = gmyth_string_list_get_string (slist, 3);
   1.487 -    //gmyth_string_list_get_string (slist, 4);
   1.488      prog->chanid = gmyth_string_list_get_string (slist, 4);
   1.489      prog->channame = gmyth_string_list_get_string (slist, 5);
   1.490      prog->chanstr = gmyth_string_list_get_string (slist, 6);    
   1.491 @@ -433,7 +349,6 @@
   1.492      			gmyth_program_info_non_null_value( prog->chansign ), 
   1.493      			gmyth_program_info_non_null_value( prog->pathname ), 
   1.494      			gmyth_string_list_get_int (slist, 11) );    
   1.495 -    //gmyth_string_list_get_int (slist, 9);
   1.496      
   1.497      prog->startts = gmyth_util_string_to_time_val( (gmyth_util_time_to_isoformat( 
   1.498      					(time_t)gmyth_string_list_get_int (slist, 11) ))->str ); //DATETIME_TO_LIST(startts)
   1.499 @@ -485,47 +400,47 @@
   1.500  const gchar*
   1.501  gmyth_program_info_to_string( const GMythProgramInfo* prog )
   1.502  {
   1.503 -	 return g_strdup_printf( "Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %s, "\
   1.504 -	 		"Channel Name: %s, Chan str: %s, Channel Sign: %s, Path Name: %s, File Size: %lld, \n"\
   1.505 -	 		"Start TS: %s, End TS: %s, Duplicate: %d, Shareable: %d, Find ID: %d, Hostname: %s, "\
   1.506 -	 		"Source ID: %d, Vard ID: %d, Input ID: %d, Rec Priority: %d, Reactivate: %d, \n"\
   1.507 -	 		"Record ID: %d, Rec Start TS: %s, Rec End TS: %s, Repeat: %d, Program Flags: %d, "\
   1.508 -	 		"Rec Group: %s, Channel Comm Free: %d, Channel Output Filters: %s, Series ID: %s, \n"\
   1.509 -	 		"Program ID: %s, Last Modified Date: %s, Original Air Date: %s, Has Air Date: %d, "
   1.510 -	 		"Play Group: %s.\n", 
   1.511 -	 	gmyth_program_info_non_null_value( prog->title ), 
   1.512 -    gmyth_program_info_non_null_value( prog->subtitle ),    
   1.513 -    gmyth_program_info_non_null_value( prog->description ),
   1.514 -    gmyth_program_info_non_null_value( prog->category ),
   1.515 +    return g_strdup_printf( "Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %s, "\
   1.516 +        "Channel Name: %s, Chan str: %s, Channel Sign: %s, Path Name: %s, File Size: %lld, \n"\
   1.517 +        "Start TS: %s, End TS: %s, Duplicate: %d, Shareable: %d, Find ID: %d, Hostname: %s, "\
   1.518 +        "Source ID: %d, Vard ID: %d, Input ID: %d, Rec Priority: %d, Reactivate: %d, \n"\
   1.519 +        "Record ID: %d, Rec Start TS: %s, Rec End TS: %s, Repeat: %d, Program Flags: %d, "\
   1.520 +        "Rec Group: %s, Channel Comm Free: %d, Channel Output Filters: %s, Series ID: %s, \n"\
   1.521 +        "Program ID: %s, Last Modified Date: %s, Original Air Date: %s, Has Air Date: %d, "
   1.522 +        "Play Group: %s.\n", 
   1.523 +        gmyth_program_info_non_null_value( prog->title ), 
   1.524 +        gmyth_program_info_non_null_value( prog->subtitle ),    
   1.525 +        gmyth_program_info_non_null_value( prog->description ),
   1.526 +        gmyth_program_info_non_null_value( prog->category ),
   1.527  		gmyth_program_info_non_null_value( prog->chanid ),
   1.528 -    gmyth_program_info_non_null_value( prog->channame ),
   1.529 -    gmyth_program_info_non_null_value( prog->chanstr ),    
   1.530 -    gmyth_program_info_non_null_value( prog->chansign ),    
   1.531 -    gmyth_program_info_non_null_value( prog->pathname ),
   1.532 -    prog->filesize,
   1.533 -    gmyth_util_time_to_string_from_time_val( prog->startts), 
   1.534 -    gmyth_util_time_to_string_from_time_val( prog->endts), 
   1.535 -    prog->duplicate,
   1.536 -    prog->shareable,
   1.537 -    prog->findid,
   1.538 -    gmyth_program_info_non_null_value( prog->hostname ),
   1.539 -    prog->sourceid,
   1.540 -    prog->cardid,
   1.541 -    prog->inputid,
   1.542 -    prog->recpriority,
   1.543 -    prog->reactivate,
   1.544 -    prog->recordid,
   1.545 -    gmyth_util_time_to_string_from_time_val(prog->recstartts),
   1.546 -    gmyth_util_time_to_string_from_time_val(prog->recendts),
   1.547 -    prog->repeat,
   1.548 -    prog->programflags,
   1.549 -    gmyth_program_info_non_null_value( prog->recgroup ),
   1.550 -    prog->chancommfree,
   1.551 -    gmyth_program_info_non_null_value( prog->chanOutputFilters ),
   1.552 -    gmyth_program_info_non_null_value( prog->seriesid ),
   1.553 -    gmyth_program_info_non_null_value( prog->programid ),
   1.554 -    gmyth_util_time_to_string_from_time_val(prog->lastmodified),
   1.555 -    gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
   1.556 -    prog->hasAirDate,
   1.557 -    gmyth_program_info_non_null_value(prog->playgroup) );
   1.558 +        gmyth_program_info_non_null_value( prog->channame ),
   1.559 +        gmyth_program_info_non_null_value( prog->chanstr ),    
   1.560 +        gmyth_program_info_non_null_value( prog->chansign ),    
   1.561 +        gmyth_program_info_non_null_value( prog->pathname ),
   1.562 +        prog->filesize,
   1.563 +        gmyth_util_time_to_string_from_time_val( prog->startts), 
   1.564 +        gmyth_util_time_to_string_from_time_val( prog->endts), 
   1.565 +        prog->duplicate,
   1.566 +        prog->shareable,
   1.567 +        prog->findid,
   1.568 +        gmyth_program_info_non_null_value( prog->hostname ),
   1.569 +        prog->sourceid,
   1.570 +        prog->cardid,
   1.571 +        prog->inputid,
   1.572 +        prog->recpriority,
   1.573 +        prog->reactivate,
   1.574 +        prog->recordid,
   1.575 +        gmyth_util_time_to_string_from_time_val(prog->recstartts),
   1.576 +        gmyth_util_time_to_string_from_time_val(prog->recendts),
   1.577 +        prog->repeat,
   1.578 +        prog->programflags,
   1.579 +        gmyth_program_info_non_null_value( prog->recgroup ),
   1.580 +        prog->chancommfree,
   1.581 +        gmyth_program_info_non_null_value( prog->chanOutputFilters ),
   1.582 +        gmyth_program_info_non_null_value( prog->seriesid ),
   1.583 +        gmyth_program_info_non_null_value( prog->programid ),
   1.584 +        gmyth_util_time_to_string_from_time_val(prog->lastmodified),
   1.585 +        gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
   1.586 +        prog->hasAirDate,
   1.587 +        gmyth_program_info_non_null_value(prog->playgroup) );
   1.588  }