tvh.diff - Tvheadend

       channel_t *ch, *x;
       xmltv_channel_t *xc;
       int id;
       caid_t *c;
       ch = RB_LAST(&channel_identifier_tree);
       if(ch == NULL) {
-...
         id = ch->ch_id + 1;
+      }
       c = calloc(1, sizeof(caid_t));
       ch = calloc(1, sizeof(channel_t));
       RB_INIT(&ch->ch_epg_events);
       LIST_INSERT_HEAD(&channels_not_xmltv_mapped, ch, ch_xc_link);
-...
           channel_set_icon(ch, xc->xc_icon);
+      }
          ch->ch_prov_id =  0;
       htsp_channel_add(ch);
       return ch;
+    }
-...
       htsmsg_get_s32(c, "dvr_extra_time_post", &ch->ch_dvr_extra_time_post);
       htsmsg_get_s32(c, "channel_number", &ch->ch_number);
       if ((s = htsmsg_get_str(c, "chan_pid")) != NULL)
           tvh_str_update(&ch->ch_prov_id, htsmsg_get_str(c, "chan_pid"));
       if((tags = htsmsg_get_list(c, "tags")) != NULL) {
         HTSMSG_FOREACH(f, tags) {
           if(f->hmf_type == HMF_S64) {
-...
       htsmsg_add_u32(m, "dvr_extra_time_post", ch->ch_dvr_extra_time_post);
       htsmsg_add_s32(m, "channel_number", ch->ch_number);
       if(ch->ch_prov_id != NULL)
         htsmsg_add_str(m, "chan_pid", ch->ch_prov_id);
       hts_settings_save(m, "channels/%d", ch->ch_id);
       htsmsg_destroy(m);
+    }
-...
+    }
     /**
      * Set the channel manual provid
     */
     void
     channel_set_mprovid(channel_t *ch, const char *prov_id)
+    {
       lock_assert(&global_lock);
         if(ch->ch_prov_id != NULL && !strcmp(ch->ch_prov_id, prov_id))
         return;
       free(ch->ch_prov_id);
       ch->ch_prov_id = strdup(prov_id);
       channel_save(ch);
       htsp_channel_update(ch);
+    }
     /**
      *  Set the amount of minutes to start before / end after recording on a channel
      */
     void

       int ch_dvr_extra_time_post;
       int ch_number;  // User configurable number
       char *ch_icon;
       char *ch_prov_id;
       struct dvr_entry_list ch_dvrs;
-...
     void channel_set_number(channel_t *ch, int number);
     void channel_set_mprovid(channel_t *ch, const char *prov_id);
     void channel_set_icon(channel_t *ch, const char *icon);
     struct xmltv_channel;

     #include "atomic.h"
     #include "dtable.h"
     #include "subscriptions.h"
     #include "channels.h"
     #include "settings.h"
     #include <openssl/des.h>
-...
       ecm_section_t *es;
       char chaninfo[32];
       caid_t *c;
       channel_t *ch = NULL;
       htsmsg_t *ll, *cc;
       htsmsg_field_t *ff;
       char *pEnd;
       int provid = 0;
       if(len > 4096)
         return;
-...
       if(!verify_provider(cwc, c->providerid))
         return;
       if (t->s_ch != NULL) {
         if((ll = hts_settings_load("channels")) != NULL) {
           ch = calloc(1, sizeof(channel_t));
           HTSMSG_FOREACH(ff, ll) {
             if(((cc = htsmsg_get_map_by_field(ff)) == NULL) || (strcoll(t->s_ch->ch_name, htsmsg_get_str(cc, "name")) != 0))
             continue;
       const char *name = htsmsg_get_str(cc, "name");
       if(name == NULL) {
         htsmsg_destroy(ll);
         return;
+         }
         tvh_str_update(&ch->ch_prov_id, htsmsg_get_str(cc, "chan_pid"));
           if (ch->ch_prov_id != NULL ) provid = strtol(ch->ch_prov_id, &pEnd, 16);
            if (provid != 0 ) {
            if (provid != c->providerid) {
               htsmsg_destroy(ll);
               return;
+                }
+              }
+            }
+          }
         free(ch);
         htsmsg_destroy(ll);
+      }
           t->s_last_providerid = c->providerid;
       switch(data[0]) {
       case 0x80:
       case 0x81:

       uint16_t s_dvb_service_id;
       uint16_t s_channel_number;
       int s_last_providerid;
       /**
        * Service name (eg. DVB service name as specified by EN 300 468)

     	  tvhlog(LOG_INFO, "serviceprobe", "%20s: joined tag \"%s\"",
     		 t->s_svcname, t->s_provider);
+    	}
     	if (t->s_last_providerid != 0) {
     	  char buf[16];
     	  snprintf(buf, sizeof(buf), "%06x", t->s_last_providerid);
     	  channel_set_mprovid(ch, buf);
     	  tvhlog(LOG_INFO, "serviceprobe", "%20s: save ProviderID \"%s\"",
     		 t->s_svcname, buf);
+    	}
     	channel_save(ch);
+          }

       htsmsg_t *c;
       uint32_t id;
       const char *s;
       char *endptr;
       int schan_pid;
       TAILQ_FOREACH(f, &in->hm_fields, hmf_link) {
         if((c = htsmsg_get_map_by_field(f)) == NULL ||
-...
         if((s = htsmsg_get_str(c, "number")) != NULL)
           channel_set_number(ch, atoi(s));
         if((s = htsmsg_get_str(c, "chan_pid")) != NULL) {
           channel_set_mprovid(ch, s);
           schan_pid = strtol(s, &endptr, 16);
+         }
+      }
+    }
-...
           htsmsg_add_s32(c, "epg_post_end",  ch->ch_dvr_extra_time_post);
           htsmsg_add_s32(c, "number",        ch->ch_number);
            if(ch->ch_prov_id != NULL)
              htsmsg_add_str(c, "chan_pid",        ch->ch_prov_id);
           htsmsg_add_msg(array, NULL, c);
+        }

     tvheadend.channels = new Ext.data.JsonStore({
         autoLoad: true,
         root:'entries',
         fields: ['name', 'chid', 'xmltvsrc', 'tags', 'ch_icon',
         fields: ['name', 'chid', 'xmltvsrc', 'tags', 'chan_pid', 'ch_icon',
     	     'epg_pre_start', 'epg_post_end', 'number'],
         id: 'chid',
         url: "channels",
-...
     	    })
     	},
+    	{
     	    header: "ProviderID",
     	    dataIndex: 'chan_pid',
     	    width: 50,
     	    sortable: true,
     	    hidden: false,
     	    editor: new fm.TextField()
     	},
+    	{
     	    header: "Icon (full URL)",
     	    dataIndex: 'ch_icon',
     	    width: 200,

Project

General

Profile

Tvheadend

Feature #361 » tvh.diff