REFACTORING : move tstamp into real scanner object

[wifihood] / wifiscanner / wifimap / replay.py

diff --git a/wifiscanner/wifimap/replay.py b/wifiscanner/wifimap/replay.py
index 6a1b1fd..a0ccd46 100644 (file)
--- a/wifiscanner/wifimap/replay.py
+++ b/wifiscanner/wifimap/replay.py
@@ -1,5 +1,4 @@
 
-import config
 import db
 
 import gobject
@@ -8,10 +7,9 @@ import os
 
 class ReplayScanner ( gobject.GObject ) :
 
-    def __init__ ( self , ifname="wlan0" ) :
+    def __init__ ( self , conf , ifname="wlan0" ) :
         gobject.GObject.__init__( self )
         self.scan_timeout = 0
-        conf = config.Configuration( 'scanner' )
         self.db = db.database( os.path.join( conf.homedir , "wifireplay.db" ) )
 
         # Values specific to replaying
@@ -28,11 +26,11 @@ class ReplayScanner ( gobject.GObject ) :
 
         # Values to be set by wireless scans
         self.scanlist = {}
-        self.tstamp = 0
         self.nscan = 0
         self.nfp = 0
 
         # Values from the Scanner object
+        self.tstamp = 0
         self.newap = 0
         self.newaps = False
         self.aps = {}