Moved stuff common to Air[Video|Photo|Tunes|Mirroring] into own folder.

tzwenn · Feb 19, 2015 · 4374d7b · 4374d7b
1 parent 92104ad
commit 4374d7b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/air-py b/air-py
diff --git a/AirPlayHandler.py → common/AirPlayHandler.py b/AirPlayHandler.py → common/AirPlayHandler.py
diff --git a/common/__init__.py b/common/__init__.py
diff --git a/register.py → common/register.py b/register.py → common/register.py
diff --git a/main.py b/main.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-import register
 import threading
-
 import BaseHTTPServer
 
+import common.register
+
 def runServer(port, handler):
 	try:
 		httpd = BaseHTTPServer.HTTPServer(('', port), handler)
@@ -13,7 +13,7 @@ def runServer(port, handler):
 		pass
 
 def main():
-	register_thread = threading.Thread(target=register.registerAirPlay)
+	register_thread = threading.Thread(target=common.register.registerAirPlay)
 	register_thread.setDaemon(True)
 	register_thread.start()
 

diff --git a/mirror/service.py b/mirror/service.py
@@ -3,20 +3,20 @@
 import fply
 import config
 import h264decode
-import AirPlayHandler
 import FrameSink
 
+import common.AirPlayHandler
 import mirror.Packet
 import mirror.Cryptor
 
-class MirrorService(AirPlayHandler.AirPlayHandler):
+class MirrorService(common.AirPlayHandler.AirPlayHandler):
 	server_version = "%s/%s" % (config.server_name, config.server_version)
 	protocol_version = "HTTP/1.1"
 	decoder_cls = h264decode.Decoder
 
 	def setup(self):
 		self.fply = fply.FPLY()
-		AirPlayHandler.AirPlayHandler.setup(self)
+		common.AirPlayHandler.AirPlayHandler.setup(self)
 
 	def do_GET(self):
 		if self.path == "/stream.xml" and self.checkAuth():