fix allocateRawChannel
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 19 Dec 2006 19:40:16 +0000 (19:40 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 19 Dec 2006 19:40:16 +0000 (19:40 +0000)
lib/dvb/dvb.h
lib/python/enigma_python.i

index 95d10916f5a06366321d9bafd9eff92117b6ccbf..fde9f741436fbea995547248daea6c221d19438b 100644 (file)
@@ -204,7 +204,7 @@ public:
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
        RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
-       static SWIG_VOID(RESULT) getInstance(ePtr<eDVBResourceManager> &SWIG_OUTPUT);
+       static RESULT getInstance(ePtr<eDVBResourceManager> &);
 #ifdef SWIG
 public:
 #endif
index 6c2ece377fed863ed81af22eeeefa6db7d740767..2a3b89fdcf3f22abfdec96282b603714bb378091 100644 (file)
@@ -75,8 +75,8 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>
 #include <lib/dvb/db.h>
-#include <lib/dvb/dvb.h>
 #include <lib/dvb/idvb.h>
+#include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/volume.h>
 #include <lib/dvb/sec.h>
@@ -190,8 +190,8 @@ typedef long time_t;
 %include <lib/dvb/epgcache.h>
 %include <lib/dvb/frontendparms.h>
 %include <lib/dvb/dvbtime.h>
-%include <lib/dvb/dvb.h>
 %include <lib/dvb/idvb.h>
+%include <lib/dvb/dvb.h>
 %include <lib/dvb/frontend.h>
 %include <lib/dvb/pmt.h>
 %include <lib/driver/avswitch.h>