Changeset 41327 for titan

Timestamp:

11/30/17 19:50:46 (5 years ago)

Author:

gost

Message:

[titan] hd51.. fix dmxsetsource

Location:

titan/titan

Files:

• cam.h (modified) (1 diff)
• dmxdev.h (modified) (2 diffs)
• dvbdev.h (modified) (2 diffs)

titan/titan/cam.h

@@ -265 +265 @@
 */
                 buf[pos++] |= (1 << node->fedev->devnr); //cadev_nr
-                if(checkbox("HD51") == 1)
-                        buf[pos++] |= (1 << node->fedev->devnr); //demux_dev_nr / Workaround wenn 0 dann geht Oscam nicht, warum?????
-                else
-                        buf[pos++] = node->fedev->devnr; //demux_dev_nr
+                buf[pos++] = node->fedev->devnr; //demux_dev_nr
 
                 buf[pos++] = 0x84; //id (fix)

titan/titan/dmxdev.h

@@ -474 +474 @@
                 return 1;
         }
+        if(checkbox("HD51") == 1)
+        {
+                if(node->fedmxsource == source)
+                        return 0;
+        }
 
 #ifdef MIPSEL
@@ -491 +496 @@
         {
                 perr("DMX_SET_SOURCE");
+        }
+        else
+        {
+                if(checkbox("HD51") == 1)
+                {
+                  struct dvbdev* nodeh = dvbdev;
+                        while(nodeh != NULL)
+                        {
+                                if(nodeh->type == DEMUXDEV && nodeh->adapter == node->adapter && nodeh->devnr == node->devnr)
+                                        nodeh->fedmxsource = source;
+                                nodeh = nodeh->next;
+                        }
+                }
         }
 //#endif

titan/titan/dvbdev.h

@@ -81 +81 @@
                 }
         }
+        
         if(type == ENCODERDEV)
         {
@@ -103 +104 @@
                 free(buf);
         }
+        
+        if(checkbox("HD51") == 1 && type == DEMUXDEV)
+                newnode->fedmxsource = -1;
+        
         if(node != NULL)
         {