first draft of nulldevice

Author: flensrocker

HISTORY

@@ -240,3 +240,5 @@ VDR Plugin 'dbus2vdr' Revision History
 2016-02-13: Version 28
 - add device interface
 
+2016-03-04: Version 29
+- add nulldevice as no-op primary device

Makefile

@@ -56,7 +56,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o channel.o connection.o device.o epg.o helper.o mainloop.o network.o object.o osd.o plugin.o recording.o remote.o sd-daemon.o setup.o shutdown.o skin.o status.o timer.o vdr.o
+OBJS = $(PLUGIN).o channel.o connection.o device.o epg.o helper.o mainloop.o network.o nulldevice.o object.o osd.o plugin.o recording.o remote.o sd-daemon.o setup.o shutdown.o skin.o status.o timer.o vdr.o
 SWOBJS = libvdr-exitpipe.o libvdr-i18n.o libvdr-thread.o libvdr-tools.o shutdown-wrapper.o
 
 ### The main target:

README

@@ -77,6 +77,10 @@ Commandline Arguments
 --no-mainloop
         don't start GMainLoop
         (don't use this option if you don't understand)
+--nulldevice[=force]
+        creates an output device, which does nothing
+        can be activated to suspend in/output of DVB streams
+        if "force" dbus2vdr will set this device as primary device on startup
 
 Interface "channel"
 -------------------
@@ -99,6 +103,9 @@ Interface "device"
 - get current primary device
   vdr-dbus-send.sh /Devices device.GetPrimary
 
+- get index of the nulldevice (-1 if not created)
+  vdr-dbus-send.sh /Devices device.GetNullDevice
+
 - request switch to primary device
   vdr-dbus-send.sh /Devices device.RequestPrimary int32:index
 

dbus2vdr.c

@@ -20,6 +20,7 @@
 #include "helper.h"
 #include "mainloop.h"
 #include "network.h"
+#include "nulldevice.h"
 #include "plugin.h"
 #include "osd.h"
 #include "recording.h"
@@ -38,7 +39,7 @@
 #include "avahi-helper.h"
 
 
-static const char *VERSION        = "28";
+static const char *VERSION        = "29";
 static const char *DESCRIPTION    = trNOOP("control vdr via D-Bus");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -153,6 +154,8 @@ class cPluginDbus2vdr : public cPlugin {
   bool _enable_system;
   bool _enable_session;
   bool _enable_network;
+  bool _enable_nulldevice;
+  bool _force_nulldevice;
   bool _first_main_thread;
 
   cDBusMainLoop   *_main_loop;
@@ -201,6 +204,8 @@ cPluginDbus2vdr::cPluginDbus2vdr(void)
   _enable_system = true;
   _enable_session = false;
   _enable_network = false;
+  _enable_nulldevice = false;
+  _force_nulldevice = false;
   _first_main_thread = true;
   _main_loop = NULL;
   _system_bus = NULL;
@@ -271,6 +276,10 @@ const char *cPluginDbus2vdr::CommandLineHelp(void)
          "    enable network support for peer2peer communication\n"
          "    a local dbus-daemon has to be started manually\n"
          "    it has to store its address at $PLUGINDIR/network-address.conf\n"
+         "  --nulldevice[=force]\n"
+         "    create a primary device which does nothing\n"
+         "    useful to suspend in- and output\n"
+         "    may force vdr to set this device as primary device on startup\n"
          "  --log=n\n"
          "    set plugin's loglevel\n";
 }
@@ -288,13 +297,14 @@ bool cPluginDbus2vdr::ProcessArgs(int argc, char *argv[])
     {"systemd", no_argument, 0, 's' | 0x400},
     {"network", no_argument, 0, 'n'},
     {"no-mainloop", no_argument, 0, 'n' | 0x100},
+    {"nulldevice", optional_argument, 0, 'd'},
     {"log", required_argument, 0, 'l'},
     {0, 0, 0, 0}
   };
 
   while (true) {
         int option_index = 0;
-        int c = getopt_long(argc, argv, "l:nop:s:uw:", options, &option_index);
+        int c = getopt_long(argc, argv, "d:l:nop:s:uw:", options, &option_index);
         if (c == -1)
            break;
         switch (c) {
@@ -361,6 +371,14 @@ bool cPluginDbus2vdr::ProcessArgs(int argc, char *argv[])
              isyslog("dbus2vdr: disable mainloop");
              break;
            }
+          case 'd':
+           {
+             _enable_nulldevice = true;
+             if (optarg)
+                _force_nulldevice = true;
+             isyslog("dbus2vdr: enable %snulldevice", _force_nulldevice ? "and force " : "");
+             break;
+           }
           }
         }
   return true;
@@ -380,6 +398,12 @@ bool cPluginDbus2vdr::Initialize(void)
   else
      dbus2vdr_Busname = cString::sprintf("%s", DBUS_VDR_BUSNAME);
 #endif
+  if (_enable_nulldevice) {
+     cNullDevice *nulldev = new cNullDevice();
+     cDBusDevices::_nulldeviceIndex = nulldev->CardIndex();
+     if (_force_nulldevice)
+        cDBusDevices::SetPrimaryDeviceRequest(cDBusDevices::_nulldeviceIndex);
+     }
   return true;
 }
 

device.c

@@ -7,6 +7,7 @@
 
 int cDBusDevices::_requestedPrimaryDevice = -1;
 cMutex cDBusDevices::_requestedPrimaryDeviceMutex;
+int cDBusDevices::_nulldeviceIndex = -1;
 
 void cDBusDevices::SetPrimaryDeviceRequest(int index)
 {
@@ -37,6 +38,9 @@ namespace cDBusDevicesHelper
     "      <arg name=\"isPrimary\"    type=\"b\" direction=\"out\"/>\n"
     "      <arg name=\"name\"         type=\"s\" direction=\"out\"/>\n"
     "    </method>\n"
+    "    <method name=\"GetNullDevice\">\n"
+    "      <arg name=\"index\"        type=\"i\" direction=\"out\"/>\n"
+    "    </method>\n"
     "    <method name=\"RequestPrimary\">\n"
     "      <arg name=\"index\"        type=\"i\" direction=\"in\"/>\n"
     "    </method>\n"
@@ -82,6 +86,14 @@ namespace cDBusDevicesHelper
     g_variant_builder_unref(builder);
   }
 
+  static void GetNullDevice(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation)
+  {
+    GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("(i)"));
+    g_variant_builder_add(Variant, "i", cDBusDevices::_nulldeviceIndex);
+    g_dbus_method_invocation_return_value(Invocation, g_variant_builder_end(builder));
+    g_variant_builder_unref(builder);
+  }
+
   static void RequestPrimary(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation)
   {
     gint32 index = -1;
@@ -113,6 +125,7 @@ cDBusDevices::cDBusDevices(void)
 :cDBusObject("/Devices", cDBusDevicesHelper::_xmlNodeInfo)
 {
   AddMethod("GetPrimary", cDBusDevicesHelper::GetPrimary);
+  AddMethod("GetNullDevice", cDBusDevicesHelper::GetNullDevice);
   AddMethod("RequestPrimary", cDBusDevicesHelper::RequestPrimary);
   AddMethod("List", cDBusDevicesHelper::List);
 }

device.h

@@ -11,6 +11,7 @@ class cDBusDevices : public cDBusObject
   static int _requestedPrimaryDevice;
 
 public:
+  static int _nulldeviceIndex;
   static void SetPrimaryDeviceRequest(int index);
   static int RequestedPrimaryDevice(bool clear);
 

nulldevice.c

@@ -0,0 +1,95 @@
+#include "nulldevice.h"
+
+#include <vdr/osd.h>
+#include <vdr/player.h>
+
+class cNullOsd : public cOsd {
+  public:
+    cNullOsd(int Left, int Top, uint Level) : cOsd(Left, Top, Level) {}
+    virtual ~cNullOsd() {}
+
+    virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null) { return NULL; }
+    virtual void DestroyPixmap(cPixmap *Pixmap) {}
+    virtual void DrawImage(const cPoint &Point, const cImage &Image) {}
+    virtual void DrawImage(const cPoint &Point, int ImageHandle) {}
+    virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas) { return oeOk; }
+    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas) { return oeOk; }
+    virtual void SaveRegion(int x1, int y1, int x2, int y2) {}
+    virtual void RestoreRegion(void) {}
+    virtual eOsdError SetPalette(const cPalette &Palette, int Area) { return oeOk; }
+    virtual void DrawPixel(int x, int y, tColor Color) {}
+    virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false) {}
+    virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault) {}
+    virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color) {}
+    virtual void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0) {}
+    virtual void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type) {}
+    virtual void Flush(void) {}
+};
+
+class cNullOsdProvider : public cOsdProvider {
+  protected:
+    virtual cOsd *CreateOsd(int Left, int Top, uint Level) { return new cNullOsd(Left, Top, Level); }
+    virtual bool ProvidesTrueColor(void) { return true; }
+    virtual int StoreImageData(const cImage &Image) { return 0; }
+    virtual void DropImageData(int ImageHandle) {}
+
+  public:
+    cNullOsdProvider() : cOsdProvider() {}
+    virtual ~cNullOsdProvider() {}
+};
+
+
+class cNullPlayer : public cPlayer {
+public:
+  cNullPlayer(void);
+  virtual ~cNullPlayer(void);
+};
+
+cNullPlayer::cNullPlayer(void)
+{
+}
+
+cNullPlayer::~cNullPlayer()
+{
+  Detach();
+}
+
+
+class cNullControl : public cControl {
+public:
+  static cNullPlayer *Player;
+
+  virtual void Hide(void) {}
+
+  cNullControl(void);
+
+  virtual ~cNullControl(void);
+};
+
+cNullPlayer *cNullControl::Player;
+
+cNullControl::cNullControl(void)
+ :cControl(Player = new cNullPlayer)
+{
+}
+
+cNullControl::~cNullControl()
+{
+  delete Player;
+  Player = NULL;
+}
+
+
+void cNullDevice::MakePrimaryDevice(bool On)
+{
+  cDevice::MakePrimaryDevice(On);
+  if (On) {
+     new cNullOsdProvider();
+     if (cNullControl::Player != NULL) {
+        cControl::Launch(new cNullControl());
+        cControl::Attach();
+        }
+     }
+  else if (cNullControl::Player)
+     cControl::Shutdown();
+}

nulldevice.h

@@ -0,0 +1,39 @@
+#ifndef __DBUS2VDR_NULLDEVICE_H
+#define __DBUS2VDR_NULLDEVICE_H
+
+#include <vdr/device.h>
+
+class cNullDevice : public cDevice
+{
+public:
+  cNullDevice() : cDevice() {}
+  virtual ~cNullDevice() {}
+
+  virtual bool Ready(void) { return true; }
+
+  virtual cString DeviceType(void) const { return "null"; }
+  virtual cString DeviceName(void) const { return "nulldevice"; }
+  virtual bool HasDecoder(void) const { return true; }
+  virtual bool AvoidRecording(void) const { return true; }
+
+  virtual bool SetPlayMode(ePlayMode PlayMode) { return true; }
+  virtual int  PlayVideo(const uchar *Data, int Length) { return Length; }
+
+  virtual int  PlayAudio(const uchar *Data, int Length, uchar Id) { return Length; }
+
+  virtual int PlayTsVideo(const uchar *Data, int Length) { return Length; }
+  virtual int PlayTsAudio(const uchar *Data, int Length) { return Length; }
+  virtual int PlayTsSubtitle(const uchar *Data, int Length) { return Length; }
+
+  virtual int PlayPes(const uchar *Data, int Length, bool VideoOnly = false) { return Length; }
+  virtual int PlayTs(const uchar *Data, int Length, bool VideoOnly = false) { return Length; }
+
+  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0) { return true; }
+  virtual bool Flush(int TimeoutMs = 0) { return true; }
+  bool Start(void) {return true;}
+
+protected:
+  virtual void MakePrimaryDevice(bool On);
+};
+
+#endif