1.1 --- a/gmyth/src/gmyth_programinfo.c Wed May 23 19:50:41 2007 +0100
1.2 +++ b/gmyth/src/gmyth_programinfo.c Thu Jun 14 18:19:52 2007 +0100
1.3 @@ -39,220 +39,220 @@
1.4 #include "gmyth_util.h"
1.5 #include "gmyth_debug.h"
1.6
1.7 -static void gmyth_program_info_class_init ( GMythProgramInfoClass * klass );
1.8 -static void gmyth_program_info_init ( GMythProgramInfo * object );
1.9 +static void gmyth_program_info_class_init(GMythProgramInfoClass * klass);
1.10 +static void gmyth_program_info_init(GMythProgramInfo * object);
1.11
1.12 -static void gmyth_program_info_dispose ( GObject * object );
1.13 -static void gmyth_program_info_finalize ( GObject * object );
1.14 +static void gmyth_program_info_dispose(GObject * object);
1.15 +static void gmyth_program_info_finalize(GObject * object);
1.16
1.17 -G_DEFINE_TYPE ( GMythProgramInfo, gmyth_program_info, G_TYPE_OBJECT )
1.18 - static const gchar *gmyth_program_info_non_null_value ( const GString *
1.19 - str );
1.20 +G_DEFINE_TYPE(GMythProgramInfo, gmyth_program_info, G_TYPE_OBJECT)
1.21 + static const gchar *gmyth_program_info_non_null_value(const GString *
1.22 + str);
1.23
1.24 - static void gmyth_program_info_class_init ( GMythProgramInfoClass * klass )
1.25 + static void 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 +gmyth_program_info_init(GMythProgramInfo * gmyth_program_info)
1.39 {
1.40 - gmyth_program_info->chancommfree = 0;
1.41 + gmyth_program_info->chancommfree = 0;
1.42
1.43 - /** A flag informing if the program has video or not. */
1.44 - gmyth_program_info->isVideo = FALSE;
1.45 - gmyth_program_info->lenMins = 0;
1.46 + /** A flag informing if the program has video or not. */
1.47 + gmyth_program_info->isVideo = FALSE;
1.48 + gmyth_program_info->lenMins = 0;
1.49
1.50 - gmyth_program_info->stars = 0.0f;
1.51 - gmyth_program_info->repeat = 0;
1.52 + gmyth_program_info->stars = 0.0f;
1.53 + gmyth_program_info->repeat = 0;
1.54
1.55 - gmyth_program_info->hasAirDate = FALSE;
1.56 + gmyth_program_info->hasAirDate = FALSE;
1.57
1.58 - gmyth_program_info->spread = 0;
1.59 - gmyth_program_info->startCol = 0;
1.60 + gmyth_program_info->spread = 0;
1.61 + gmyth_program_info->startCol = 0;
1.62
1.63 - gmyth_program_info->recpriority2 = 0;
1.64 - gmyth_program_info->reactivate = 0;
1.65 + gmyth_program_info->recpriority2 = 0;
1.66 + gmyth_program_info->reactivate = 0;
1.67
1.68 - gmyth_program_info->recordid = 0;
1.69 - gmyth_program_info->parentid = 0;
1.70 + gmyth_program_info->recordid = 0;
1.71 + gmyth_program_info->parentid = 0;
1.72
1.73 - /** The backend video source id associated to this program.*/
1.74 - gmyth_program_info->sourceid = 0;
1.75 - /** the backend input id associated to this program.*/
1.76 - gmyth_program_info->inputid = 0;
1.77 - /** The backend card id associated to this program.*/
1.78 - gmyth_program_info->cardid = 0;
1.79 - gmyth_program_info->shareable = FALSE;
1.80 - gmyth_program_info->duplicate = FALSE;
1.81 + /** The backend video source id associated to this program.*/
1.82 + gmyth_program_info->sourceid = 0;
1.83 + /** the backend input id associated to this program.*/
1.84 + gmyth_program_info->inputid = 0;
1.85 + /** The backend card id associated to this program.*/
1.86 + gmyth_program_info->cardid = 0;
1.87 + gmyth_program_info->shareable = FALSE;
1.88 + gmyth_program_info->duplicate = FALSE;
1.89
1.90 - gmyth_program_info->findid = 0;
1.91 + gmyth_program_info->findid = 0;
1.92
1.93 - gmyth_program_info->programflags = 0;
1.94 - gmyth_program_info->transcoder = 0;
1.95 + gmyth_program_info->programflags = 0;
1.96 + gmyth_program_info->transcoder = 0;
1.97
1.98 - gmyth_program_info->recpriority = 0;
1.99 + gmyth_program_info->recpriority = 0;
1.100
1.101 - /** The file size of the recorded program.*/
1.102 - gmyth_program_info->filesize = -1;
1.103 + /** The file size of the recorded program.*/
1.104 + gmyth_program_info->filesize = -1;
1.105 }
1.106
1.107 static void
1.108 -gmyth_program_info_dispose ( GObject * object )
1.109 +gmyth_program_info_dispose(GObject * object)
1.110 {
1.111 - GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO ( object );
1.112 + GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object);
1.113
1.114 - if ( gmyth_program_info->chanid != NULL )
1.115 - {
1.116 - g_string_free ( gmyth_program_info->chanid, TRUE );
1.117 - gmyth_program_info->chanid = NULL;
1.118 - }
1.119 + if (gmyth_program_info->chanid != NULL)
1.120 + {
1.121 + g_string_free(gmyth_program_info->chanid, TRUE);
1.122 + gmyth_program_info->chanid = NULL;
1.123 + }
1.124
1.125 - /** The program start time. */
1.126 - g_free ( gmyth_program_info->startts );
1.127 + /** The program start time. */
1.128 + g_free(gmyth_program_info->startts);
1.129
1.130 - /** The program end time. */
1.131 - g_free ( gmyth_program_info->endts );
1.132 + /** The program end time. */
1.133 + g_free(gmyth_program_info->endts);
1.134
1.135 - /** The recording schedule start time. */
1.136 - g_free ( gmyth_program_info->recstartts );
1.137 + /** The recording schedule start time. */
1.138 + g_free(gmyth_program_info->recstartts);
1.139
1.140 - /** The recording schedule end time */
1.141 - g_free ( gmyth_program_info->recendts );
1.142 + /** The recording schedule end time */
1.143 + g_free(gmyth_program_info->recendts);
1.144
1.145 - /** The program title. */
1.146 - if ( gmyth_program_info->title != NULL )
1.147 - {
1.148 - g_string_free ( gmyth_program_info->title, TRUE );
1.149 - gmyth_program_info->title = NULL;
1.150 - }
1.151 + /** The program title. */
1.152 + if (gmyth_program_info->title != NULL)
1.153 + {
1.154 + g_string_free(gmyth_program_info->title, TRUE);
1.155 + gmyth_program_info->title = NULL;
1.156 + }
1.157
1.158 - /** The program subtitle. */
1.159 - if ( gmyth_program_info->subtitle != NULL )
1.160 - {
1.161 - g_string_free ( gmyth_program_info->subtitle, TRUE );
1.162 - gmyth_program_info->subtitle = NULL;
1.163 - }
1.164 + /** The program subtitle. */
1.165 + if (gmyth_program_info->subtitle != NULL)
1.166 + {
1.167 + g_string_free(gmyth_program_info->subtitle, TRUE);
1.168 + gmyth_program_info->subtitle = NULL;
1.169 + }
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 description. */
1.178 + if (gmyth_program_info->description != NULL)
1.179 + {
1.180 + g_string_free(gmyth_program_info->description, TRUE);
1.181 + gmyth_program_info->description = NULL;
1.182 + }
1.183
1.184 - /** The program category. */
1.185 - if ( gmyth_program_info->category != NULL )
1.186 - {
1.187 - g_string_free ( gmyth_program_info->category, TRUE );
1.188 - gmyth_program_info->category = NULL;
1.189 - }
1.190 + /** The program category. */
1.191 + if (gmyth_program_info->category != NULL)
1.192 + {
1.193 + g_string_free(gmyth_program_info->category, TRUE);
1.194 + gmyth_program_info->category = NULL;
1.195 + }
1.196
1.197 - if ( gmyth_program_info->chanstr != NULL )
1.198 - {
1.199 - g_string_free ( gmyth_program_info->chanstr, TRUE );
1.200 - gmyth_program_info->chanstr = NULL;
1.201 - }
1.202 + if (gmyth_program_info->chanstr != NULL)
1.203 + {
1.204 + g_string_free(gmyth_program_info->chanstr, TRUE);
1.205 + gmyth_program_info->chanstr = NULL;
1.206 + }
1.207
1.208 - if ( gmyth_program_info->chansign != NULL )
1.209 - {
1.210 - g_string_free ( gmyth_program_info->chansign, TRUE );
1.211 - gmyth_program_info->chansign = NULL;
1.212 - }
1.213 + if (gmyth_program_info->chansign != NULL)
1.214 + {
1.215 + g_string_free(gmyth_program_info->chansign, TRUE);
1.216 + gmyth_program_info->chansign = NULL;
1.217 + }
1.218
1.219 - /** The associated channel name. */
1.220 - if ( gmyth_program_info->channame != NULL )
1.221 - {
1.222 - g_string_free ( gmyth_program_info->channame, TRUE );
1.223 - gmyth_program_info->channame = NULL;
1.224 - }
1.225 + /** The associated channel name. */
1.226 + if (gmyth_program_info->channame != NULL)
1.227 + {
1.228 + g_string_free(gmyth_program_info->channame, TRUE);
1.229 + gmyth_program_info->channame = NULL;
1.230 + }
1.231
1.232 - if ( gmyth_program_info->chanOutputFilters != NULL )
1.233 - {
1.234 - g_string_free ( gmyth_program_info->chanOutputFilters, TRUE );
1.235 - gmyth_program_info->chanOutputFilters = NULL;
1.236 - }
1.237 + if (gmyth_program_info->chanOutputFilters != NULL)
1.238 + {
1.239 + g_string_free(gmyth_program_info->chanOutputFilters, TRUE);
1.240 + gmyth_program_info->chanOutputFilters = NULL;
1.241 + }
1.242
1.243 - if ( gmyth_program_info->seriesid != NULL )
1.244 - {
1.245 - g_string_free ( gmyth_program_info->seriesid, TRUE );
1.246 - gmyth_program_info->chanOutputFilters = NULL;
1.247 - }
1.248 + if (gmyth_program_info->seriesid != NULL)
1.249 + {
1.250 + g_string_free(gmyth_program_info->seriesid, TRUE);
1.251 + gmyth_program_info->chanOutputFilters = NULL;
1.252 + }
1.253
1.254 - /** The program unique id. */
1.255 - if ( gmyth_program_info->programid != NULL )
1.256 - {
1.257 - g_string_free ( gmyth_program_info->programid, TRUE );
1.258 - gmyth_program_info->programid = NULL;
1.259 - }
1.260 + /** The program unique id. */
1.261 + if (gmyth_program_info->programid != NULL)
1.262 + {
1.263 + g_string_free(gmyth_program_info->programid, TRUE);
1.264 + gmyth_program_info->programid = NULL;
1.265 + }
1.266
1.267 - if ( gmyth_program_info->catType != NULL )
1.268 - {
1.269 - g_string_free ( gmyth_program_info->catType, TRUE );
1.270 - gmyth_program_info->catType = NULL;
1.271 - }
1.272 + if (gmyth_program_info->catType != NULL)
1.273 + {
1.274 + g_string_free(gmyth_program_info->catType, TRUE);
1.275 + gmyth_program_info->catType = NULL;
1.276 + }
1.277
1.278 - if ( gmyth_program_info->sortTitle != NULL )
1.279 - {
1.280 - g_string_free ( gmyth_program_info->sortTitle, TRUE );
1.281 - gmyth_program_info->sortTitle = NULL;
1.282 - }
1.283 + if (gmyth_program_info->sortTitle != NULL)
1.284 + {
1.285 + g_string_free(gmyth_program_info->sortTitle, TRUE);
1.286 + gmyth_program_info->sortTitle = NULL;
1.287 + }
1.288
1.289 - if ( gmyth_program_info->year != NULL )
1.290 - {
1.291 - g_string_free ( gmyth_program_info->year, TRUE );
1.292 - gmyth_program_info->year = NULL;
1.293 - }
1.294 + if (gmyth_program_info->year != NULL)
1.295 + {
1.296 + g_string_free(gmyth_program_info->year, TRUE);
1.297 + gmyth_program_info->year = NULL;
1.298 + }
1.299
1.300 - g_free ( gmyth_program_info->originalAirDate );
1.301 + g_free(gmyth_program_info->originalAirDate);
1.302
1.303 - g_free ( gmyth_program_info->lastmodified );
1.304 + g_free(gmyth_program_info->lastmodified);
1.305
1.306 - g_free ( gmyth_program_info->lastInUseTime );
1.307 + g_free(gmyth_program_info->lastInUseTime);
1.308
1.309 - if ( gmyth_program_info->schedulerid != NULL )
1.310 - {
1.311 - g_string_free ( gmyth_program_info->schedulerid, TRUE );
1.312 - gmyth_program_info->schedulerid = NULL;
1.313 - }
1.314 + if (gmyth_program_info->schedulerid != NULL)
1.315 + {
1.316 + g_string_free(gmyth_program_info->schedulerid, TRUE);
1.317 + gmyth_program_info->schedulerid = NULL;
1.318 + }
1.319
1.320 - if ( gmyth_program_info->recgroup != NULL )
1.321 - {
1.322 - g_string_free ( gmyth_program_info->recgroup, TRUE );
1.323 - gmyth_program_info->recgroup = NULL;
1.324 - }
1.325 + if (gmyth_program_info->recgroup != NULL)
1.326 + {
1.327 + g_string_free(gmyth_program_info->recgroup, TRUE);
1.328 + gmyth_program_info->recgroup = NULL;
1.329 + }
1.330
1.331 - if ( gmyth_program_info->playgroup != NULL )
1.332 - {
1.333 - g_string_free ( gmyth_program_info->playgroup, TRUE );
1.334 - gmyth_program_info->playgroup = NULL;
1.335 - }
1.336 + if (gmyth_program_info->playgroup != NULL)
1.337 + {
1.338 + g_string_free(gmyth_program_info->playgroup, TRUE);
1.339 + gmyth_program_info->playgroup = NULL;
1.340 + }
1.341
1.342 - /** The file name of the recorded program.*/
1.343 - if ( gmyth_program_info->pathname != NULL )
1.344 - {
1.345 - g_string_free ( gmyth_program_info->pathname, TRUE );
1.346 - gmyth_program_info->pathname = NULL;
1.347 - }
1.348 + /** The file name of the recorded program.*/
1.349 + if (gmyth_program_info->pathname != NULL)
1.350 + {
1.351 + g_string_free(gmyth_program_info->pathname, TRUE);
1.352 + gmyth_program_info->pathname = NULL;
1.353 + }
1.354
1.355 - if ( gmyth_program_info->hostname != NULL )
1.356 - {
1.357 - g_string_free ( gmyth_program_info->hostname, TRUE );
1.358 - gmyth_program_info->hostname = NULL;
1.359 - }
1.360 + if (gmyth_program_info->hostname != NULL)
1.361 + {
1.362 + g_string_free(gmyth_program_info->hostname, TRUE);
1.363 + gmyth_program_info->hostname = NULL;
1.364 + }
1.365
1.366 - G_OBJECT_CLASS ( gmyth_program_info_parent_class )->dispose ( object );
1.367 + G_OBJECT_CLASS(gmyth_program_info_parent_class)->dispose(object);
1.368 }
1.369
1.370 static void
1.371 -gmyth_program_info_finalize ( GObject * object )
1.372 +gmyth_program_info_finalize(GObject * object)
1.373 {
1.374 - g_signal_handlers_destroy ( object );
1.375 + g_signal_handlers_destroy(object);
1.376
1.377 - G_OBJECT_CLASS ( gmyth_program_info_parent_class )->finalize ( object );
1.378 + G_OBJECT_CLASS(gmyth_program_info_parent_class)->finalize(object);
1.379 }
1.380
1.381 /**
1.382 @@ -261,12 +261,12 @@
1.383 * @return a new instance of GMythProgramInfo.
1.384 */
1.385 GMythProgramInfo *
1.386 -gmyth_program_info_new ( void )
1.387 +gmyth_program_info_new(void)
1.388 {
1.389 - GMythProgramInfo *program_info =
1.390 - GMYTH_PROGRAM_INFO ( g_object_new ( GMYTH_PROGRAM_INFO_TYPE, NULL ) );
1.391 + GMythProgramInfo *program_info =
1.392 + GMYTH_PROGRAM_INFO(g_object_new(GMYTH_PROGRAM_INFO_TYPE, NULL));
1.393
1.394 - return program_info;
1.395 + return program_info;
1.396 }
1.397
1.398 /**
1.399 @@ -280,68 +280,68 @@
1.400 * @return a GMythStringList with the program info fields.
1.401 */
1.402 GMythStringList *
1.403 -gmyth_program_info_to_string_list ( GMythProgramInfo * prog,
1.404 - GMythStringList * slist )
1.405 +gmyth_program_info_to_string_list(GMythProgramInfo * prog,
1.406 + GMythStringList * slist)
1.407 {
1.408 - g_return_val_if_fail ( prog != NULL, NULL );
1.409 - g_return_val_if_fail ( slist != NULL, NULL );
1.410 + g_return_val_if_fail(prog != NULL, NULL);
1.411 + g_return_val_if_fail(slist != NULL, NULL);
1.412
1.413 - gmyth_string_list_append_string ( slist, prog->title ); /* 0 */
1.414 - gmyth_string_list_append_string ( slist, prog->subtitle ); /* 1 */
1.415 - gmyth_string_list_append_string ( slist, prog->description ); /* 2 */
1.416 - gmyth_string_list_append_string ( slist, prog->category ); /* 3 */
1.417 - gmyth_string_list_append_string ( slist, prog->chanid ); /* 4 */
1.418 - gmyth_string_list_append_string ( slist, prog->chanstr ); /* 5 */
1.419 - gmyth_string_list_append_string ( slist, prog->chansign ); /* 6 */
1.420 - gmyth_string_list_append_string ( slist, prog->channame ); /* 7 */
1.421 - gmyth_string_list_append_string ( slist, prog->pathname ); /* 8 */
1.422 - gmyth_string_list_append_int64 ( slist, 0 ); /* 9 */
1.423 + gmyth_string_list_append_string(slist, prog->title); /* 0 */
1.424 + gmyth_string_list_append_string(slist, prog->subtitle); /* 1 */
1.425 + gmyth_string_list_append_string(slist, prog->description); /* 2 */
1.426 + gmyth_string_list_append_string(slist, prog->category); /* 3 */
1.427 + gmyth_string_list_append_string(slist, prog->chanid); /* 4 */
1.428 + gmyth_string_list_append_string(slist, prog->chanstr); /* 5 */
1.429 + gmyth_string_list_append_string(slist, prog->chansign); /* 6 */
1.430 + gmyth_string_list_append_string(slist, prog->channame); /* 7 */
1.431 + gmyth_string_list_append_string(slist, prog->pathname); /* 8 */
1.432 + gmyth_string_list_append_int64(slist, 0); /* 9 */
1.433
1.434 - // fixme
1.435 - //gmyth_string_list_append_int64 (slist, 100/*prog->filesize*/); /* 9 */
1.436 - //gmyth_string_list_append_int (slist, 0); /* 10 */
1.437 + // fixme
1.438 + //gmyth_string_list_append_int64 (slist, 100/*prog->filesize*/); /* 9 */
1.439 + //gmyth_string_list_append_int (slist, 0); /* 10 */
1.440
1.441 - if ( prog->startts )
1.442 - gmyth_string_list_append_int ( slist, prog->startts->tv_sec ); /* 11 *///DATETIME_TO_LIST(startts)
1.443 - else
1.444 - gmyth_string_list_append_int ( slist, 0 );
1.445 + if (prog->startts)
1.446 + gmyth_string_list_append_int(slist, prog->startts->tv_sec); /* 11 *///DATETIME_TO_LIST(startts)
1.447 + else
1.448 + gmyth_string_list_append_int(slist, 0);
1.449
1.450 - if ( prog->endts )
1.451 - gmyth_string_list_append_int ( slist, prog->endts->tv_sec ); /* 12 *///DATETIME_TO_LIST(endts)
1.452 - else
1.453 - gmyth_string_list_append_int ( slist, 0 );
1.454 + if (prog->endts)
1.455 + gmyth_string_list_append_int(slist, prog->endts->tv_sec); /* 12 *///DATETIME_TO_LIST(endts)
1.456 + else
1.457 + gmyth_string_list_append_int(slist, 0);
1.458
1.459 - gmyth_string_list_append_int ( slist, prog->duplicate ); /* 13 */
1.460 - gmyth_string_list_append_int ( slist, prog->shareable ); /* 14 */
1.461 - gmyth_string_list_append_int ( slist, prog->findid ); /* 15 */
1.462 - gmyth_string_list_append_string ( slist, prog->hostname ); /* 16 */
1.463 - gmyth_string_list_append_int ( slist, prog->sourceid ); /* 17 */
1.464 - gmyth_string_list_append_int ( slist, prog->cardid ); /* 18 */
1.465 - gmyth_string_list_append_int ( slist, prog->inputid ); /* 19 */
1.466 - gmyth_string_list_append_int ( slist, prog->recpriority ); /* 20 */
1.467 - gmyth_string_list_append_int ( slist, 0 /*prog->recstatus */ ); /* 21 */
1.468 - gmyth_string_list_append_int ( slist, prog->recordid ); /* 22 */
1.469 - gmyth_string_list_append_int ( slist, 0 /*prog->rectype */ ); /* 23 */
1.470 - gmyth_string_list_append_int ( slist, 0 /*prog->dupin */ ); /* 24 */
1.471 - gmyth_string_list_append_int ( slist, 0 /*prog->dupmethod */ ); /* 25 */
1.472 - gmyth_string_list_append_int ( slist, prog->recstartts != NULL ? prog->recstartts->tv_sec : 0 ); /* 26 *///DATETIME_TO_LIST(recstartts)
1.473 - gmyth_string_list_append_int ( slist, prog->recendts != NULL ? prog->recendts->tv_sec : 0 ); /* 27 *///DATETIME_TO_LIST(recendts)
1.474 - gmyth_string_list_append_int ( slist, prog->repeat ); /* 28 */
1.475 - gmyth_string_list_append_int ( slist, prog->programflags ); /* 29 */
1.476 - gmyth_string_list_append_char_array ( slist, "Default" ); /* 30 *///prog->(recgroup != "") ? recgroup : "Default")
1.477 - gmyth_string_list_append_int ( slist, prog->chancommfree ); /* 31 */
1.478 - gmyth_string_list_append_string ( slist, prog->chanOutputFilters ); /* 32 */
1.479 - gmyth_string_list_append_string ( slist, prog->seriesid ); /* 33 */
1.480 - gmyth_string_list_append_string ( slist, prog->programid ); /* 34 */
1.481 - gmyth_string_list_append_char_array ( slist, "" ); /* 35 */
1.482 - gmyth_string_list_append_int ( slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0 ); /* 36 *///DATETIME_TO_LIST(lastmodified)
1.483 - gmyth_string_list_append_int ( slist, 0 ); /* 37 *///FLOAT_TO_LIST(stars)
1.484 - gmyth_string_list_append_int ( slist, prog->originalAirDate != NULL ? prog->originalAirDate->tv_sec : 0 ); /* 38 *///DATETIME_TO_LIST(QDateTime(originalAirDate))
1.485 - gmyth_string_list_append_int ( slist, prog->hasAirDate ); /* 39 */
1.486 - gmyth_string_list_append_char_array ( slist, "Default" ); /* 40 *///prog->(playgroup != "") ? playgroup : "Default")
1.487 - gmyth_string_list_append_int ( slist, prog->recpriority2 ); /* 41 */
1.488 + gmyth_string_list_append_int(slist, prog->duplicate); /* 13 */
1.489 + gmyth_string_list_append_int(slist, prog->shareable); /* 14 */
1.490 + gmyth_string_list_append_int(slist, prog->findid); /* 15 */
1.491 + gmyth_string_list_append_string(slist, prog->hostname); /* 16 */
1.492 + gmyth_string_list_append_int(slist, prog->sourceid); /* 17 */
1.493 + gmyth_string_list_append_int(slist, prog->cardid); /* 18 */
1.494 + gmyth_string_list_append_int(slist, prog->inputid); /* 19 */
1.495 + gmyth_string_list_append_int(slist, prog->recpriority); /* 20 */
1.496 + gmyth_string_list_append_int(slist, 0 /*prog->recstatus */ ); /* 21 */
1.497 + gmyth_string_list_append_int(slist, prog->recordid); /* 22 */
1.498 + gmyth_string_list_append_int(slist, 0 /*prog->rectype */ ); /* 23 */
1.499 + gmyth_string_list_append_int(slist, 0 /*prog->dupin */ ); /* 24 */
1.500 + gmyth_string_list_append_int(slist, 0 /*prog->dupmethod */ ); /* 25 */
1.501 + gmyth_string_list_append_int(slist, prog->recstartts != NULL ? prog->recstartts->tv_sec : 0); /* 26 *///DATETIME_TO_LIST(recstartts)
1.502 + gmyth_string_list_append_int(slist, prog->recendts != NULL ? prog->recendts->tv_sec : 0); /* 27 *///DATETIME_TO_LIST(recendts)
1.503 + gmyth_string_list_append_int(slist, prog->repeat); /* 28 */
1.504 + gmyth_string_list_append_int(slist, prog->programflags); /* 29 */
1.505 + gmyth_string_list_append_char_array(slist, "Default"); /* 30 *///prog->(recgroup != "") ? recgroup : "Default")
1.506 + gmyth_string_list_append_int(slist, prog->chancommfree); /* 31 */
1.507 + gmyth_string_list_append_string(slist, prog->chanOutputFilters); /* 32 */
1.508 + gmyth_string_list_append_string(slist, prog->seriesid); /* 33 */
1.509 + gmyth_string_list_append_string(slist, prog->programid); /* 34 */
1.510 + gmyth_string_list_append_char_array(slist, ""); /* 35 */
1.511 + gmyth_string_list_append_int(slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0); /* 36 *///DATETIME_TO_LIST(lastmodified)
1.512 + gmyth_string_list_append_int(slist, 0); /* 37 *///FLOAT_TO_LIST(stars)
1.513 + gmyth_string_list_append_int(slist, prog->originalAirDate != NULL ? prog->originalAirDate->tv_sec : 0); /* 38 *///DATETIME_TO_LIST(QDateTime(originalAirDate))
1.514 + gmyth_string_list_append_int(slist, prog->hasAirDate); /* 39 */
1.515 + gmyth_string_list_append_char_array(slist, "Default"); /* 40 *///prog->(playgroup != "") ? playgroup : "Default")
1.516 + gmyth_string_list_append_int(slist, prog->recpriority2); /* 41 */
1.517
1.518 - return slist;
1.519 + return slist;
1.520 }
1.521
1.522 /**
1.523 @@ -353,72 +353,72 @@
1.524 * @return a GMythProgramInfo representing the string list got from network.
1.525 */
1.526 GMythProgramInfo *
1.527 -gmyth_program_info_from_string_list_from_pos ( GMythStringList * slist,
1.528 - guint pos )
1.529 +gmyth_program_info_from_string_list_from_pos(GMythStringList * slist,
1.530 + guint pos)
1.531 {
1.532 - GMythProgramInfo *prog = gmyth_program_info_new ( );
1.533 + GMythProgramInfo *prog = gmyth_program_info_new();
1.534
1.535 - g_return_val_if_fail ( slist != NULL &&
1.536 - gmyth_string_list_get_string ( slist, pos ) != NULL,
1.537 - NULL );
1.538 + g_return_val_if_fail(slist != NULL &&
1.539 + gmyth_string_list_get_string(slist, pos) != NULL,
1.540 + NULL);
1.541
1.542 - prog->title = gmyth_string_list_get_string ( slist, pos );
1.543 - prog->subtitle = gmyth_string_list_get_string ( slist, pos + 1 );
1.544 - prog->description = gmyth_string_list_get_string ( slist, pos + 2 );
1.545 - prog->category = gmyth_string_list_get_string ( slist, pos + 3 );
1.546 - prog->chanid = gmyth_string_list_get_string ( slist, pos + 4 );
1.547 - prog->channame = gmyth_string_list_get_string ( slist, pos + 5 );
1.548 - prog->chanstr = gmyth_string_list_get_string ( slist, pos + 6 );
1.549 - prog->chansign = gmyth_string_list_get_string ( slist, pos + 7 );
1.550 - prog->pathname = gmyth_string_list_get_string ( slist, pos + 8 );
1.551 + prog->title = gmyth_string_list_get_string(slist, pos);
1.552 + prog->subtitle = gmyth_string_list_get_string(slist, pos + 1);
1.553 + prog->description = gmyth_string_list_get_string(slist, pos + 2);
1.554 + prog->category = gmyth_string_list_get_string(slist, pos + 3);
1.555 + prog->chanid = gmyth_string_list_get_string(slist, pos + 4);
1.556 + prog->channame = gmyth_string_list_get_string(slist, pos + 5);
1.557 + prog->chanstr = gmyth_string_list_get_string(slist, pos + 6);
1.558 + prog->chansign = gmyth_string_list_get_string(slist, pos + 7);
1.559 + prog->pathname = gmyth_string_list_get_string(slist, pos + 8);
1.560
1.561 - prog->filesize = gmyth_string_list_get_int64 ( slist, pos + 9 );
1.562 + prog->filesize = gmyth_string_list_get_int64(slist, pos + 9);
1.563
1.564 - gmyth_debug ( "Prog info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s, %d ]\n",
1.565 - gmyth_program_info_non_null_value ( prog->title ),
1.566 - gmyth_program_info_non_null_value ( prog->subtitle ),
1.567 - gmyth_program_info_non_null_value ( prog->description ),
1.568 - gmyth_program_info_non_null_value ( prog->category ),
1.569 - gmyth_program_info_non_null_value ( prog->chanid ),
1.570 - gmyth_program_info_non_null_value ( prog->channame ),
1.571 - gmyth_program_info_non_null_value ( prog->chanstr ),
1.572 - gmyth_program_info_non_null_value ( prog->chansign ),
1.573 - gmyth_program_info_non_null_value ( prog->pathname ),
1.574 - gmyth_string_list_get_int ( slist, pos + 11 ) );
1.575 + gmyth_debug("Prog info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s, %d ]\n",
1.576 + gmyth_program_info_non_null_value(prog->title),
1.577 + gmyth_program_info_non_null_value(prog->subtitle),
1.578 + gmyth_program_info_non_null_value(prog->description),
1.579 + gmyth_program_info_non_null_value(prog->category),
1.580 + gmyth_program_info_non_null_value(prog->chanid),
1.581 + gmyth_program_info_non_null_value(prog->channame),
1.582 + gmyth_program_info_non_null_value(prog->chanstr),
1.583 + gmyth_program_info_non_null_value(prog->chansign),
1.584 + gmyth_program_info_non_null_value(prog->pathname),
1.585 + gmyth_string_list_get_int(slist, pos + 11));
1.586
1.587 - prog->startts = gmyth_util_string_to_time_val ( ( gmyth_util_time_to_isoformat ( ( time_t ) gmyth_string_list_get_int ( slist, pos + 11 ) ) )->str ); //DATETIME_TO_LIST(startts)
1.588 - prog->endts = gmyth_util_string_to_time_val ( ( gmyth_util_time_to_isoformat ( ( time_t ) gmyth_string_list_get_int ( slist, pos + 12 ) ) )->str ); //DATETIME_TO_LIST(endts)
1.589 - prog->duplicate = gmyth_string_list_get_int ( slist, pos + 13 );
1.590 - prog->shareable = gmyth_string_list_get_int ( slist, pos + 14 );
1.591 - prog->findid = gmyth_string_list_get_int ( slist, pos + 15 );
1.592 - prog->hostname = gmyth_string_list_get_string ( slist, pos + 16 );
1.593 - prog->sourceid = gmyth_string_list_get_int ( slist, pos + 17 );
1.594 - prog->cardid = gmyth_string_list_get_int ( slist, pos + 18 );
1.595 - prog->inputid = gmyth_string_list_get_int ( slist, pos + 19 );
1.596 - prog->recpriority = gmyth_string_list_get_int ( slist, pos + 20 );
1.597 - prog->reactivate = gmyth_string_list_get_int ( slist, pos + 21 );
1.598 - prog->recordid = gmyth_string_list_get_int ( slist, pos + 22 );
1.599 - gmyth_string_list_get_int ( slist, pos + 23 );
1.600 - gmyth_string_list_get_int ( slist, pos + 24 );
1.601 - gmyth_string_list_get_int ( slist, pos + 25 );
1.602 - prog->recstartts = gmyth_util_string_to_time_val ( ( gmyth_util_time_to_isoformat ( ( time_t ) gmyth_string_list_get_int ( slist, pos + 26 ) ) )->str ); //DATETIME_TO_LIST(recstartts)
1.603 - prog->recendts = gmyth_util_string_to_time_val ( ( gmyth_util_time_to_isoformat ( ( time_t ) gmyth_string_list_get_int ( slist, pos + 27 ) ) )->str ); //DATETIME_TO_LIST(recendts)
1.604 - prog->repeat = gmyth_string_list_get_int ( slist, pos + 28 );
1.605 - prog->programflags = gmyth_string_list_get_int ( slist, pos + 29 );
1.606 - prog->recgroup = gmyth_string_list_get_string ( slist, pos + 30 ); //prog->(recgroup != "") ? recgroup : "Default")
1.607 - prog->chancommfree = gmyth_string_list_get_int ( slist, pos + 31 );
1.608 - prog->chanOutputFilters = gmyth_string_list_get_string ( slist, pos + 32 );
1.609 - prog->seriesid = gmyth_string_list_get_string ( slist, pos + 33 );
1.610 - prog->programid = gmyth_string_list_get_string ( slist, pos + 34 );
1.611 - gmyth_string_list_get_string ( slist, pos + 35 );
1.612 - 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)
1.613 - gmyth_string_list_get_int ( slist, pos + 37 ); //FLOAT_TO_LIST(stars)
1.614 - prog->originalAirDate = gmyth_util_string_to_time_val ( ( gmyth_util_time_to_isoformat ( ( time_t ) gmyth_string_list_get_int ( slist, pos + 38 ) ) )->str ); //DATETIME_TO_LIST(QDateTime(originalAirDate))
1.615 - prog->hasAirDate = gmyth_string_list_get_int ( slist, pos + 39 );
1.616 - prog->playgroup = gmyth_string_list_get_string ( slist, pos + 40 ); //prog->(playgroup != "") ? playgroup : "Default")
1.617 - prog->recpriority2 = gmyth_string_list_get_int ( slist, pos + 41 );
1.618 + prog->startts = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 11)))->str); //DATETIME_TO_LIST(startts)
1.619 + prog->endts = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 12)))->str); //DATETIME_TO_LIST(endts)
1.620 + prog->duplicate = gmyth_string_list_get_int(slist, pos + 13);
1.621 + prog->shareable = gmyth_string_list_get_int(slist, pos + 14);
1.622 + prog->findid = gmyth_string_list_get_int(slist, pos + 15);
1.623 + prog->hostname = gmyth_string_list_get_string(slist, pos + 16);
1.624 + prog->sourceid = gmyth_string_list_get_int(slist, pos + 17);
1.625 + prog->cardid = gmyth_string_list_get_int(slist, pos + 18);
1.626 + prog->inputid = gmyth_string_list_get_int(slist, pos + 19);
1.627 + prog->recpriority = gmyth_string_list_get_int(slist, pos + 20);
1.628 + prog->reactivate = gmyth_string_list_get_int(slist, pos + 21);
1.629 + prog->recordid = gmyth_string_list_get_int(slist, pos + 22);
1.630 + gmyth_string_list_get_int(slist, pos + 23);
1.631 + gmyth_string_list_get_int(slist, pos + 24);
1.632 + gmyth_string_list_get_int(slist, pos + 25);
1.633 + prog->recstartts = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 26)))->str); //DATETIME_TO_LIST(recstartts)
1.634 + prog->recendts = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 27)))->str); //DATETIME_TO_LIST(recendts)
1.635 + prog->repeat = gmyth_string_list_get_int(slist, pos + 28);
1.636 + prog->programflags = gmyth_string_list_get_int(slist, pos + 29);
1.637 + prog->recgroup = gmyth_string_list_get_string(slist, pos + 30); //prog->(recgroup != "") ? recgroup : "Default")
1.638 + prog->chancommfree = gmyth_string_list_get_int(slist, pos + 31);
1.639 + prog->chanOutputFilters = gmyth_string_list_get_string(slist, pos + 32);
1.640 + prog->seriesid = gmyth_string_list_get_string(slist, pos + 33);
1.641 + prog->programid = gmyth_string_list_get_string(slist, pos + 34);
1.642 + gmyth_string_list_get_string(slist, pos + 35);
1.643 + 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)
1.644 + gmyth_string_list_get_int(slist, pos + 37); //FLOAT_TO_LIST(stars)
1.645 + prog->originalAirDate = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 38)))->str); //DATETIME_TO_LIST(QDateTime(originalAirDate))
1.646 + prog->hasAirDate = gmyth_string_list_get_int(slist, pos + 39);
1.647 + prog->playgroup = gmyth_string_list_get_string(slist, pos + 40); //prog->(playgroup != "") ? playgroup : "Default")
1.648 + prog->recpriority2 = gmyth_string_list_get_int(slist, pos + 41);
1.649
1.650 - return prog;
1.651 + return prog;
1.652 }
1.653
1.654 /**
1.655 @@ -429,15 +429,15 @@
1.656 * @return a GMythProgramInfo representing the string list got from network.
1.657 */
1.658 GMythProgramInfo *
1.659 -gmyth_program_info_from_string_list ( GMythStringList * slist )
1.660 +gmyth_program_info_from_string_list(GMythStringList * slist)
1.661 {
1.662 - GMythProgramInfo *prog = NULL;
1.663 + GMythProgramInfo *prog = NULL;
1.664
1.665 - g_return_val_if_fail ( slist != NULL, NULL );
1.666 + g_return_val_if_fail(slist != NULL, NULL);
1.667
1.668 - prog = gmyth_program_info_from_string_list_from_pos ( slist, 0 );
1.669 + prog = gmyth_program_info_from_string_list_from_pos(slist, 0);
1.670
1.671 - return prog;
1.672 + return prog;
1.673 }
1.674
1.675 /**
1.676 @@ -448,51 +448,51 @@
1.677 * @return a GMythProgramInfo representing the string list got from network.
1.678 */
1.679 GMythProgramInfo *
1.680 -gmyth_program_info_from_string_list_next_prog ( GMythStringList * slist )
1.681 +gmyth_program_info_from_string_list_next_prog(GMythStringList * slist)
1.682 {
1.683 - GMythProgramInfo *prog = gmyth_program_info_new ( );
1.684 + GMythProgramInfo *prog = gmyth_program_info_new();
1.685
1.686 - g_return_val_if_fail ( slist != NULL, NULL );
1.687 + g_return_val_if_fail(slist != NULL, NULL);
1.688
1.689 - /*
1.690 - {Home Improvement[]:[]No, No, Godot[]:[]
1.691 - US sitcom about a DIY-obsessed father of three. When
1.692 - Tim tries to sell off his extra ticket for an ice hockey game, he is arrested as a tout.[]:[]
1.693 - Sitcom[]:[]2007-04-18T15:30:00[]:[]2007-04-18T16:00:00[]:[]ABC1[]:[]
1.694 - /home/hmelo/.mythtv/channels/abc1.jpg[]:[]abc1[]:[]2000[]:[]25725844[]:[] }
1.695 - */
1.696 + /*
1.697 + {Home Improvement[]:[]No, No, Godot[]:[]
1.698 + US sitcom about a DIY-obsessed father of three. When
1.699 + Tim tries to sell off his extra ticket for an ice hockey game, he is arrested as a tout.[]:[]
1.700 + Sitcom[]:[]2007-04-18T15:30:00[]:[]2007-04-18T16:00:00[]:[]ABC1[]:[]
1.701 + /home/hmelo/.mythtv/channels/abc1.jpg[]:[]abc1[]:[]2000[]:[]25725844[]:[] }
1.702 + */
1.703
1.704 - prog->title = gmyth_string_list_get_string ( slist, 0 );
1.705 - prog->subtitle = gmyth_string_list_get_string ( slist, 1 );
1.706 - prog->description = gmyth_string_list_get_string ( slist, 2 );
1.707 - prog->category = gmyth_string_list_get_string ( slist, 3 );
1.708 - prog->startts = gmyth_util_string_to_time_val ( gmyth_string_list_get_char_array ( slist, 4 ) ); //DATETIME_TO_LIST(startts)
1.709 - prog->endts = gmyth_util_string_to_time_val ( gmyth_string_list_get_char_array ( slist, 5 ) ); //DATETIME_TO_LIST(endts)
1.710 - prog->channame = gmyth_string_list_get_string ( slist, 6 );
1.711 - prog->chansign = gmyth_string_list_get_string ( slist, 7 );
1.712 - prog->chanstr = gmyth_string_list_get_string ( slist, 8 );
1.713 - prog->chanid = gmyth_string_list_get_string ( slist, 9 );
1.714 - prog->filesize = gmyth_string_list_get_int64 ( slist, 10 );
1.715 + prog->title = gmyth_string_list_get_string(slist, 0);
1.716 + prog->subtitle = gmyth_string_list_get_string(slist, 1);
1.717 + prog->description = gmyth_string_list_get_string(slist, 2);
1.718 + prog->category = gmyth_string_list_get_string(slist, 3);
1.719 + prog->startts = gmyth_util_string_to_time_val(gmyth_string_list_get_char_array(slist, 4)); //DATETIME_TO_LIST(startts)
1.720 + prog->endts = gmyth_util_string_to_time_val(gmyth_string_list_get_char_array(slist, 5)); //DATETIME_TO_LIST(endts)
1.721 + prog->channame = gmyth_string_list_get_string(slist, 6);
1.722 + prog->chansign = gmyth_string_list_get_string(slist, 7);
1.723 + prog->chanstr = gmyth_string_list_get_string(slist, 8);
1.724 + prog->chanid = gmyth_string_list_get_string(slist, 9);
1.725 + prog->filesize = gmyth_string_list_get_int64(slist, 10);
1.726
1.727 - gmyth_debug ( "NEXT program info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s ]\n",
1.728 - gmyth_program_info_non_null_value ( prog->title ),
1.729 - gmyth_program_info_non_null_value ( prog->subtitle ),
1.730 - gmyth_program_info_non_null_value ( prog->description ),
1.731 - gmyth_program_info_non_null_value ( prog->category ),
1.732 - gmyth_program_info_non_null_value ( prog->chanid ),
1.733 - gmyth_program_info_non_null_value ( prog->channame ),
1.734 - gmyth_program_info_non_null_value ( prog->chanstr ),
1.735 - gmyth_program_info_non_null_value ( prog->chansign ),
1.736 - gmyth_program_info_non_null_value ( prog->pathname ) );
1.737 + gmyth_debug("NEXT program info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s ]\n",
1.738 + gmyth_program_info_non_null_value(prog->title),
1.739 + gmyth_program_info_non_null_value(prog->subtitle),
1.740 + gmyth_program_info_non_null_value(prog->description),
1.741 + gmyth_program_info_non_null_value(prog->category),
1.742 + gmyth_program_info_non_null_value(prog->chanid),
1.743 + gmyth_program_info_non_null_value(prog->channame),
1.744 + gmyth_program_info_non_null_value(prog->chanstr),
1.745 + gmyth_program_info_non_null_value(prog->chansign),
1.746 + gmyth_program_info_non_null_value(prog->pathname));
1.747
1.748 - return prog;
1.749 + return prog;
1.750 }
1.751
1.752 static const gchar *
1.753 -gmyth_program_info_non_null_value ( const GString * str )
1.754 +gmyth_program_info_non_null_value(const GString * str)
1.755 {
1.756 - return ( str != NULL && str->str != NULL
1.757 - && strlen ( str->str ) > 0 ? str->str : " " );
1.758 + return (str != NULL && str->str != NULL
1.759 + && strlen(str->str) > 0 ? str->str : " ");
1.760 }
1.761
1.762 /**
1.763 @@ -503,45 +503,44 @@
1.764 * @return a string representing the program info.
1.765 */
1.766 const gchar *
1.767 -gmyth_program_info_to_string ( const GMythProgramInfo * prog )
1.768 +gmyth_program_info_to_string(const GMythProgramInfo * prog)
1.769 {
1.770 - return
1.771 - g_strdup_printf
1.772 - ( "Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %s, "
1.773 - "Channel Name: %s, Chan str: %s, Channel Sign: %s, Path Name: %s, File Size: %lld, \n"
1.774 - "Start TS: %s, End TS: %s, Duplicate: %d, Shareable: %d, Find ID: %d, Hostname: %s, "
1.775 - "Source ID: %d, Vard ID: %d, Input ID: %d, Rec Priority: %d, Reactivate: %d, \n"
1.776 - "Record ID: %d, Rec Start TS: %s, Rec End TS: %s, Repeat: %d, Program Flags: %d, "
1.777 - "Rec Group: %s, Channel Comm Free: %d, Channel Output Filters: %s, Series ID: %s, \n"
1.778 - "Program ID: %s, Last Modified Date: %s, Original Air Date: %s, Has Air Date: %d, "
1.779 - "Play Group: %s.\n",
1.780 - gmyth_program_info_non_null_value ( prog->title ),
1.781 - gmyth_program_info_non_null_value ( prog->subtitle ),
1.782 - gmyth_program_info_non_null_value ( prog->description ),
1.783 - gmyth_program_info_non_null_value ( prog->category ),
1.784 - gmyth_program_info_non_null_value ( prog->chanid ),
1.785 - gmyth_program_info_non_null_value ( prog->channame ),
1.786 - gmyth_program_info_non_null_value ( prog->chanstr ),
1.787 - gmyth_program_info_non_null_value ( prog->chansign ),
1.788 - gmyth_program_info_non_null_value ( prog->pathname ), prog->filesize,
1.789 - gmyth_util_time_to_string_from_time_val ( prog->startts ),
1.790 - gmyth_util_time_to_string_from_time_val ( prog->endts ),
1.791 - prog->duplicate, prog->shareable, prog->findid,
1.792 - gmyth_program_info_non_null_value ( prog->hostname ), prog->sourceid,
1.793 - prog->cardid, prog->inputid, prog->recpriority, prog->reactivate,
1.794 - prog->recordid,
1.795 - gmyth_util_time_to_string_from_time_val ( prog->recstartts ),
1.796 - gmyth_util_time_to_string_from_time_val ( prog->recendts ),
1.797 - prog->repeat, prog->programflags,
1.798 - gmyth_program_info_non_null_value ( prog->recgroup ),
1.799 - prog->chancommfree,
1.800 - gmyth_program_info_non_null_value ( prog->chanOutputFilters ),
1.801 - gmyth_program_info_non_null_value ( prog->seriesid ),
1.802 - gmyth_program_info_non_null_value ( prog->programid ),
1.803 - gmyth_util_time_to_string_from_time_val ( prog->lastmodified ),
1.804 - gmyth_util_time_to_string_from_time_val ( prog->originalAirDate ),
1.805 - prog->hasAirDate,
1.806 - gmyth_program_info_non_null_value ( prog->playgroup ) );
1.807 + return
1.808 + g_strdup_printf
1.809 + ("Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %s, "
1.810 + "Channel Name: %s, Chan str: %s, Channel Sign: %s, Path Name: %s, File Size: %lld, \n"
1.811 + "Start TS: %s, End TS: %s, Duplicate: %d, Shareable: %d, Find ID: %d, Hostname: %s, "
1.812 + "Source ID: %d, Vard ID: %d, Input ID: %d, Rec Priority: %d, Reactivate: %d, \n"
1.813 + "Record ID: %d, Rec Start TS: %s, Rec End TS: %s, Repeat: %d, Program Flags: %d, "
1.814 + "Rec Group: %s, Channel Comm Free: %d, Channel Output Filters: %s, Series ID: %s, \n"
1.815 + "Program ID: %s, Last Modified Date: %s, Original Air Date: %s, Has Air Date: %d, "
1.816 + "Play Group: %s.\n",
1.817 + gmyth_program_info_non_null_value(prog->title),
1.818 + gmyth_program_info_non_null_value(prog->subtitle),
1.819 + gmyth_program_info_non_null_value(prog->description),
1.820 + gmyth_program_info_non_null_value(prog->category),
1.821 + gmyth_program_info_non_null_value(prog->chanid),
1.822 + gmyth_program_info_non_null_value(prog->channame),
1.823 + gmyth_program_info_non_null_value(prog->chanstr),
1.824 + gmyth_program_info_non_null_value(prog->chansign),
1.825 + gmyth_program_info_non_null_value(prog->pathname), prog->filesize,
1.826 + gmyth_util_time_to_string_from_time_val(prog->startts),
1.827 + gmyth_util_time_to_string_from_time_val(prog->endts),
1.828 + prog->duplicate, prog->shareable, prog->findid,
1.829 + gmyth_program_info_non_null_value(prog->hostname), prog->sourceid,
1.830 + prog->cardid, prog->inputid, prog->recpriority, prog->reactivate,
1.831 + prog->recordid,
1.832 + gmyth_util_time_to_string_from_time_val(prog->recstartts),
1.833 + gmyth_util_time_to_string_from_time_val(prog->recendts),
1.834 + prog->repeat, prog->programflags,
1.835 + gmyth_program_info_non_null_value(prog->recgroup),
1.836 + prog->chancommfree,
1.837 + gmyth_program_info_non_null_value(prog->chanOutputFilters),
1.838 + gmyth_program_info_non_null_value(prog->seriesid),
1.839 + gmyth_program_info_non_null_value(prog->programid),
1.840 + gmyth_util_time_to_string_from_time_val(prog->lastmodified),
1.841 + gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
1.842 + prog->hasAirDate, gmyth_program_info_non_null_value(prog->playgroup));
1.843 }
1.844
1.845 /**
1.846 @@ -553,17 +552,17 @@
1.847 * @return <code>true</code>, if the program infos are equals.
1.848 */
1.849 gboolean
1.850 -gmyth_program_info_is_equals ( const GMythProgramInfo * prog1,
1.851 - const GMythProgramInfo * prog2 )
1.852 +gmyth_program_info_is_equals(const GMythProgramInfo * prog1,
1.853 + const GMythProgramInfo * prog2)
1.854 {
1.855 - if ( ( strcmp ( gmyth_program_info_non_null_value ( prog1->title ),
1.856 - gmyth_program_info_non_null_value ( prog2->title ) ) == 0 )
1.857 - ||
1.858 - ( strcmp
1.859 - ( gmyth_program_info_non_null_value ( prog1->pathname ),
1.860 - gmyth_program_info_non_null_value ( prog2->pathname ) ) == 0 ) )
1.861 - return TRUE;
1.862 - else
1.863 - return FALSE;
1.864 + if ((strcmp(gmyth_program_info_non_null_value(prog1->title),
1.865 + gmyth_program_info_non_null_value(prog2->title)) == 0)
1.866 + ||
1.867 + (strcmp
1.868 + (gmyth_program_info_non_null_value(prog1->pathname),
1.869 + gmyth_program_info_non_null_value(prog2->pathname)) == 0))
1.870 + return TRUE;
1.871 + else
1.872 + return FALSE;
1.873
1.874 }