diff options
| author | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-10-26 17:10:39 (GMT) |
|---|---|---|
| committer | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-10-26 17:10:39 (GMT) |
| commit | ad4a0e88fbec354b566de1a551d9ae7557e438c8 (patch) | |
| tree | 9ea5b8cced09f660c15014c7de4a91873fada8c8 /recordtube.py | |
| parent | 9dbb3e45a389b1d9cff978eba3d1d6968f27be06 (diff) | |
more mesh prep
git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@736 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
Diffstat (limited to 'recordtube.py')
| -rw-r--r-- | recordtube.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/recordtube.py b/recordtube.py index ae587e0..3bdd306 100644 --- a/recordtube.py +++ b/recordtube.py @@ -11,7 +11,7 @@ from dbus.gobject_service import ExportedGObject class RecordTube(ExportedGObject): __gsignals__ = { - 'filepart': + 'recd-requested': (gobject.SIGNAL_RUN_FIRST, None, [object,object,object,object,object,object,object]), 'new-recd': (gobject.SIGNAL_RUN_FIRST, None, [object,object]) @@ -26,6 +26,7 @@ class RecordTube(ExportedGObject): self._logger = logger self.tube.add_signal_receiver(self._newRecdTubeCb, 'notifyBudsOfNewRecd', IFACE, path=PATH, sender_keyword='sender') + self.tube.add_signal_receiver(self._reqRecdTubeCb, 'requestRecdBits', IFACE, path=PATH, sender_keyword='sender') @signal(dbus_interface=IFACE, signature='ss') #dual s for 2x strings @@ -36,10 +37,10 @@ class RecordTube(ExportedGObject): def _newRecdTubeCb(self, recorder, recdXml, sender=None): self._logger.debug("_newRecdTubeCb from " + recorder ) if sender == self.tube.get_unique_name(): - self._logger.debug("sender is my bus name, so ignore my own signal") + self._logger.debug("_newRecdTubeCb: sender is my bus name, so ignore my own signal") return elif (recorder == self.myHashKey): - self._logger.debug('excuse me? you are asking me to share a photo with myself?') + self._logger.debug('_newRecdTubeCb: excuse me? you are asking me to share a photo with myself?') return self.emit( "new-recd", str(recorder), str(recdXml) ) @@ -47,4 +48,18 @@ class RecordTube(ExportedGObject): @signal(dbus_interface=IFACE, signature='sss') #triple s for 3x strings def requestRecdBits(self, whoWantsIt, whoTheyWantItFrom, recdMd5sumOfIt ): - self._logger.debug('I am requesting a high-res version of someones media.')
\ No newline at end of file + self._logger.debug('I am requesting a high-res version of someones media.') + + + def _reqRecdTubeCb(self, whoWantsIt, whoTheyWantItFrom, recdMd5sumOfIt, sender=None): + if sender == self.tube.get_unique_name(): + self._logger.debug("_reqRecdTubeCb: sender is my bus name, so ignore my own signal") + return + elif (whoWantsIt == self.myHashKey): + self._logger.debug('_reqRecdTubeCb: excuse me? you are asking me to share a photo with myself?') + return + elif (whoTheyWantItFrom != self.myHashKey): + self._logger.debug('_reqRecdTubeCb: ive overhead someone wants a photo, but not from me') + return + + self.emit( "recd-requested", str(whoWantsIt), str(recdMd5sumOfIt) )
\ No newline at end of file |