patch_3.4.diff - Tvheadend

+    {
       return _config_set_str("muxconfpath", path);
+    }
     const char *config_get_subscript_pre_command ( void )
+    {
       return htsmsg_get_str(config, "subpreproccommand");
+    }
     int config_set_subscript_pre_command ( const char *str )
+    {
       return _config_set_str("subpreproccommand", str);
+    }
     const char *config_get_subscript_post_command ( void )
+    {
       return htsmsg_get_str(config, "subpostproccommand");
+    }
     int config_set_subscript_post_command ( const char *str )
+    {
       return _config_set_str("subpostproccommand", str);
+    }

     int         config_set_language    ( const char *str )
       __attribute__((warn_unused_result));
     const char *config_get_subscript_pre_command  ( void );
     int         config_set_subscript_pre_command  ( const char *str )
       __attribute__((warn_unused_result));
     const char *config_get_subscript_post_command  ( void );
     int         config_set_subscript_post_command  ( const char *str )
       __attribute__((warn_unused_result));
     #endif /* __TVH_CONFIG__H__ */

     /*
      *  tvheadend, transport and subscription functions
      *  Copyright (C) 2007 Andreas ?man
      *  Copyright (C) 2007 Andreas �man
+     *
      *  This program is free software: you can redistribute it and/or modify
      *  it under the terms of the GNU General Public License as published by
-...
     #include "atomic.h"
     #include "dvb/dvb.h"
     #include "config2.h"
     #include "htsstr.h"
     #include "spawn.h"
     struct th_subscription_list subscriptions;
     static gtimer_t subscription_reschedule_timer;
-...
         streaming_target_deliver(s->ths_output, sm);
+      }
       // process pre-command
       do_pre_command(s);
       pthread_mutex_unlock(&t->s_stream_mutex);
+    }
-...
     void
     subscription_unlink_service(th_subscription_t *s, int reason)
+    {
       tvhlog(LOG_INFO, "subscription_unlink_service", "subscription_unlink_service");
       streaming_message_t *sm;
       service_t *t = s->ths_service;
-...
       pthread_mutex_unlock(&t->s_stream_mutex);
       LIST_REMOVE(s, ths_service_link);
       do_post_command(s);
       s->ths_service = NULL;
+    }
     /*
      * Process pre-command before linking subscription
      */
     void do_pre_command(th_subscription_t *s) {
     	if (subscriptions_active() && config_get_subscript_pre_command()) {
     		char **args = htsstr_argsplit(config_get_subscript_pre_command());
     		spawnv(args[0], (void *) args);
+    	}
+    }
     /*
      * Process post-command after unlinking subscription
      */
     void do_post_command(th_subscription_t *s) {
     	tvhlog(LOG_INFO, "do_post_command", "do_post_command");
     	if (!subscriptions_active() && config_get_subscript_post_command()) {
     		char **args = htsstr_argsplit(config_get_subscript_post_command());
     		spawnv(args[0], (void *) args);
+    	}
+    }
     /**
+     *
-...
     void
     subscription_unsubscribe(th_subscription_t *s)
+    {
       tvhlog(LOG_INFO, "subscription_unsubscribe", "subscription_unsubscribe");
       service_t *t = s->ths_service;
       lock_assert(&global_lock);

     /*
      *  tvheadend, subscription functions
      *  Copyright (C) 2007 Andreas ?man
      *  Copyright (C) 2007 Andreas �man
+     *
      *  This program is free software: you can redistribute it and/or modify
      *  it under the terms of the GNU General Public License as published by
-...
     int subscriptions_active(void);
     void do_pre_command(th_subscription_t *s);
     void do_post_command(th_subscription_t *s);
     struct htsmsg;
     struct htsmsg *subscription_create_msg(th_subscription_t *s);

           save |= config_set_muxconfpath(str);
         if ((str = http_arg_get(&hc->hc_req_args, "language")))
           save |= config_set_language(str);
         if ((str = http_arg_get(&hc->hc_req_args, "subpreproccommand")))
           save |= config_set_subscript_pre_command(str);
         if ((str = http_arg_get(&hc->hc_req_args, "subpostproccommand")))
           save |= config_set_subscript_post_command(str);
         if (save)
         if (save)
           config_save();

            'imagecache_enabled', 'imagecache_ok_period',
            'imagecache_fail_period', 'imagecache_ignore_sslcert',
            'tvhtime_update_enabled', 'tvhtime_ntp_enabled',
            'tvhtime_tolerance']);
            'tvhtime_tolerance',
             'subpreproccommand',
             'subpostproccommand'
            ]);
     	/* ****************************************************************
     	 * Form Fields
-...
         items : [ imagecacheEnabled, imagecacheOkPeriod, imagecacheFailPeriod,
                   imagecacheIgnoreSSLCert ]
       });
       if (tvheadend.capabilities.indexOf('imagecache') == -1)
         imagecachePanel.hide();
       var preProcCommand = new Ext.form.TextField({
         name: 'subpreproccommand',
         fieldLabel: 'Command to process before new subscription starts<br/>(e.g. /home/user/preprocess.sh)',
         width: 400
       });
     	/* ****************************************************************
       var postProcCommand = new Ext.form.TextField({
         name: 'subpostproccommand',
         fieldLabel: 'Command to process after last subscription ends<br/>(e.g. /home/user/postprocess.sh)',
         width: 400
       });
       var subProcessPanel = new Ext.form.FieldSet({
         title: 'Extra processing for subscriptions',
         width: 700,
         autoHeight: true,
         collapsible: true,
         animCollapse: true,
         items: [preProcCommand, postProcCommand]
       });
       var subProcessPanel_form = new Ext.form.FormPanel({
         border: false,
         labelAlign: 'left',
         labelWidth: 200,
         waitMsgTarget: true,
         layout: 'form',
         defaultType: 'textfield',
         autoHeight: true,
         items: [subProcessPanel]
       });
      	/* ****************************************************************
     	 * Form
     	 * ***************************************************************/
-...
     		layout : 'form',
     		defaultType : 'textfield',
     		autoHeight : true,
     		items : [ language, dvbscanPath,
     		items : [ language, dvbscanPath, subProcessPanel,
                   imagecachePanel, tvhtimePanel ],
     		tbar : [ saveButton, '->', helpButton ]
     	});

Project

General

Profile

Tvheadend

Bug #3967 » patch_3.4.diff