Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/model.py
diff options
context:
space:
mode:
authorerikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2007-11-01 01:22:03 (GMT)
committer erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2007-11-01 01:22:03 (GMT)
commit9dfa0aac7af0187cc90fd3b857335660218214f3 (patch)
treeb5feb2e19b3c504f865629d414e7aaeb6bfa46db /model.py
parentb256c95ce2393dd76718951b9a4417e71abcc8a8 (diff)
more fixes
git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@799 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
Diffstat (limited to 'model.py')
-rw-r--r--model.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/model.py b/model.py
index ef1d03b..3862af8 100644
--- a/model.py
+++ b/model.py
@@ -39,13 +39,13 @@ import operator
from sugar.datastore import datastore
import sugar.env
-from record import Record
from constants import Constants
from instance import Instance
from recorded import Recorded
from color import Color
from ui import UI
import utils
+import record
class Model:
@@ -54,6 +54,7 @@ class Model:
self.MODE = Constants.MODE_PHOTO
self.UPDATING = True
self.RECORDING = False
+ record.Record.log.debug("ok")
self.mediaTypes = {}
self.mediaTypes[Constants.TYPE_PHOTO] = {Constants.keyName:"photo", Constants.keyMime:"image/jpeg", Constants.keyExt:"jpg", Constants.keyIstr:Constants.istrPhoto}
@@ -268,14 +269,14 @@ class Model:
def meshShareRecd( self, recd ):
- Record.log.debug('meshShareRecd')
+ record.Record.log.debug('meshShareRecd')
#hey, i just took a cool video.audio.photo! let me show you!
if (self.ca.recTube != None):
- Record.log.debug('meshShareRecd: we have a recTube')
+ record.Record.log.debug('meshShareRecd: we have a recTube')
recdXml = self.ca.getRecdXmlString(recd)
- Record.log.debug('meshShareRecd: created XML')
+ record.Record.log.debug('meshShareRecd: created XML')
self.ca.recTube.notifyBudsOfNewRecd( Instance.keyHashPrintable, recdXml )
- Record.log.debug('meshShareRecd: notifyBuds')
+ record.Record.log.debug('meshShareRecd: notifyBuds')
def cannotSaveVideo( self ):