Changeset 30944

Timestamp:

11/12/14 15:53:20 (9 years ago)

Author:

gost

Message:

[titan] nemesis.. test hdmi-in when pip

Location:

titan/titan

Files:

• infobar.h (modified) (1 diff)
• pip.h (modified) (3 diffs)
• struct.h (modified) (2 diffs)

titan/titan/infobar.h

@@ -690 +690 @@
                 if(rcret == getrcconfigint("rcmedia", NULL))
                 {
+                        //fuer HDMI IN test bei PIP
+                        if(status.pipservice->dmxvideodev != NULL)
+                                piphdmi(status.pipservice, 0);
 /*
                         struct skin* pluginnode = getplugin("Media Center");

titan/titan/pip.h

@@ -389 +389 @@
         if(node != NULL)
         {
-                if(node->videodev != NULL)
+                if(node->dmxvideodev != NULL)
                 {
                         node->fedev->felock--;
@@ -401 +401 @@
                 videoclose(node->videodev, -1);
                 
-                pippos(node->videodev, 0, 0, 0, 0, 1);
+                if(flag == 0)
+                        pippos(node->videodev, 0, 0, 0, 0, 1);
                 
                 node->videodev = NULL;
-                dmxstop(node->dmxvideodev);
-                dmxclose(node->dmxvideodev, -1);
-                node->dmxvideodev = NULL;
+                
+                if(node->dmxvideodev != NULL)
+                {
+                        dmxstop(node->dmxvideodev);
+                        dmxclose(node->dmxvideodev, -1);
+                        node->dmxvideodev = NULL;
+                }
                                 
                 return 0;
@@ -413 +418 @@
 }
 
+int piphdmi(struct service *node, int flag)
+{
+        struct dvbdev *videonode = NULL;
+        
+        if(node != NULL && node->type != NOTHING && node->type != HDMIIN)
+                pipstop(status.pipservice, 1);
+        
+        videonode = videoopen(0, 1);
+        node->videodev = videonode;
+        node->type = HDMIIN;
+        
+        if(videonode != NULL)
+        {
+                videoselectsource(videonode, VIDEO_SOURCE_HDMI);
+                videosetstreamtype(videonode, 0);
+                videoplay(videonode);
+        }
+        
+        return 0;
+}
+        
+
 #endif

titan/titan/struct.h

@@ -156 +156 @@
 #define MSDOS_SUPER_MAGIC 0x4d44
 
+#ifndef VIDEO_SOURCE_HDMI
+#define VIDEO_SOURCE_HDMI 2
+#endif
+#ifndef AUDIO_SOURCE_HDMI
+#define AUDIO_SOURCE_HDMI 2
+#endif
+
 //Start Function Entry Point
 #define STARTFUNC
@@ -200 +207 @@
 enum {ALLCHANNEL, SATCHANNEL, PROVIDERCHANNEL, AZCHANNEL, BOUQUETCHANNEL, SATLIST, PROVIDERLIST, AZLIST, MAINBOUQUETLIST};
 enum {NOMODE, MVMODE, RMMODE, CPMODE, PROTECTMODE, EDITMODE};
-enum {NOTHING, CHANNEL, STILLPIC, RECORDDIRECT, RECORDTIMER, RECORDTIMESHIFT, RECORDSTREAM, TMPOTHER, RECORDPLAY};
+enum {NOTHING, CHANNEL, STILLPIC, RECORDDIRECT, RECORDTIMER, RECORDTIMESHIFT, RECORDSTREAM, TMPOTHER, RECORDPLAY, HDMIIN};
 enum {START, PAUSE, STOP};
 enum {DEACTIVE, ACTIVE, INPAUSE, ERROR};