diff options
| author | Daniel Drake <dsd@laptop.org> | 2008-11-23 22:41:30 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@airbag.localdomain> | 2008-11-23 23:01:30 (GMT) |
| commit | 2ef24e9c7d6bfb4734ba9601130b429151be0f15 (patch) | |
| tree | c1e21177c8688160d53e634c588efe3c46e144b9 /instance.py | |
| parent | 0d4a9f6f8fd1fb7d487b4afed77aa7a834476d4b (diff) | |
Pipeline rework
Record-59 is broken in joyride because we moved to a gstreamer, which
doesn't like these broken pipelines.
This commit reworks the whole pipeline system, making it easier to
read and generally better structured.
This is the work I did this summer, which didn't quite work for 8.2.
Now that we have upgraded to the newer gstreamer in F10, the bugs
have disappeared. There are a couple of quirks with video recording
but it works well.
Diffstat (limited to 'instance.py')
| -rw-r--r-- | instance.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/instance.py b/instance.py index 0aac3ad..1ab5407 100644 --- a/instance.py +++ b/instance.py @@ -10,7 +10,12 @@ import record class Instance: key = profile.get_pubkey() - keyHash = util._sha_data(key) + if hasattr(util, '_sha_data'): + # sugar-0.82 and previous + keyHash = util._sha_data(key) + else: + keyHash = util.sha_data(key) + keyHashPrintable = util.printable_hash(keyHash) nickName = profile.get_nick_name() @@ -40,4 +45,5 @@ def recreateTmp(): def recreateData(): if (not os.path.exists(Instance.dataPath)): - os.makedirs(Instance.dataPath)
\ No newline at end of file + os.makedirs(Instance.dataPath) + |