# HG changeset patch # User morphbr # Date 1182864753 -3600 # Node ID 6620b703740772b899ec405e2917e1c7d076f5fe # Parent b57cdd5fb898161ba0ea8e697ed7de0cf79ccf47 [svn r765] * Removed Multicast feature diff -r b57cdd5fb898 -r 6620b7037407 gmyth-stream/server/0.3/plugins/transcoders/mencoder.py --- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py Fri Jun 22 20:03:35 2007 +0100 +++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py Tue Jun 26 14:32:33 2007 +0100 @@ -260,32 +260,13 @@ if not self._run_mencoder(output=subprocess.PIPE): return False - if not self.params_first("multicast", False): - try: - while self.proc and self.proc.poll() == None: - d = self.proc.stdout.read(1024) - outfd.write(d) - except Exception, e: - self.log.error(self.tid, "Error: %s" % e) - return False - else: - try: - outfd.write("OK ") - multicast_ip = self.params_first("multicast", - "225.100.100.100") - multicast_port = int(self.params_first("multicastport", - "12345")) - sock = socket.socket(socket.AF_INET, - socket.SOCK_DGRAM, socket.IPPROTO_UDP) - sock.setsockopt(socket.IPPROTO_IP, - socket.IP_MULTICAST_TTL, 2) - - while self.proc and self.proc.poll() == None: - d = self.proc.stdout.read(1024) - sock.sendto(d, (multicast_ip, multicast_port)) - except Exception, e: - self.log.error(self.tid, "Error: %s" % e) - return False + try: + while self.proc and self.proc.poll() == None: + d = self.proc.stdout.read(1024) + outfd.write(d) + except Exception, e: + self.log.error(self.tid, "Error: %s" % e) + return False self.log.info(self.tid, "OK: Done") return True