small changes

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 5801dd6c4a089c816b206c6ed707518166dd0f3b..bc51ccd89b61d9753171a6c14a6ab98539ca2e59 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -199,8 +199,8 @@ public:
 #ifdef SWIG
 public:
 #endif
-       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
-       static SWIG_VOID(RESULT) getInstance(ePtr<eDVBResourceManager> &OUTPUT);
+       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &, int frontend_index);
+       static RESULT getInstance(ePtr<eDVBResourceManager> &);
 };
 TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
 #ifndef SWIG

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 319a9c0b914037fab6411d7e86c0919f81d52269..5c94b009c2a69c924a8acf9670c76da95129ae2a 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -447,7 +447,7 @@ public:
        virtual RESULT getState(int &SWIG_OUTPUT)=0;    
 
                /* direct frontend access for raw channels and/or status inquiries. */
-       virtual RESULT getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
+       virtual RESULT getFrontend(ePtr<iDVBFrontend> &)=0;
 
 #ifndef SWIG
        virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 067ef9eaf8dd0b011a6896db440b6d86a1b1ed72..390d55a0f6b33f37e0463d581e3de55ecdba4297 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -185,18 +185,25 @@ class PositionerSetup(Screen):
 
        def diseqc(self, what):
                res_mgr = eDVBResourceManagerPtr()
-               eDVBResourceManager.getInstance(res_mgr)
-               raw_channel = iDVBChannelPtr()
-               res_mgr.allocateRawChannel(raw_channel, self.feid)
-               frontend = raw_channel.getFrontend()
-               cmd = eDVBDiseqcCommand
-               if what == "moveWest":
-                       cmd.setCommandString('\xe1\x31\x69\x40') 
-               elif what == "moveEast":
-                       cmd.setCommandString('\xe1\x31\x68\x40') 
+               if eDVBResourceManager.getInstance(res_mgr) == 0:
+                       raw_channel = iDVBChannelPtr()
+                       if res_mgr.allocateRawChannel(raw_channel, self.feid) == 0:
+                               frontend = iDVBFrontendPtr()
+                               if raw_channel.getFrontend(frontend) == 0:
+                                       cmd = eDVBDiseqcCommand()
+                                       if what == "moveWest":
+                                               cmd.setCommandString('\xe1\x31\x69\x40') 
+                                       elif what == "moveEast":
+                                               cmd.setCommandString('\xe1\x31\x68\x40') 
+                                       else:
+                                               cmd.setCommandString('\xe0\x31\x60') #positioner stop
+                                       frontend.sendDiseqc(cmd)
+                               else:
+                                       print "getFrontend failed"
+                       else:
+                               print "getRawChannel failed"
                else:
-                       cmd.setCommandString('\xe0\x31\x60') #positioner stop
-               frontend.sendDiseqc(cmd)
+                               print "getResourceManager instance failed"
 
        def updateStatus(self):
                if eDVBSatelliteEquipmentControl.getInstance().isRotorMoving():