Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/recorded.py
diff options
context:
space:
mode:
authorerikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2007-09-06 20:33:42 (GMT)
committer erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2007-09-06 20:33:42 (GMT)
commita9ccf482b1cb429a91a5ca91927f6a0d1e1f4292 (patch)
treec27c20b455439813d5fde9f3842a1a2874e61357 /recorded.py
parent141ab59ee37c6d9613246f4928c482d1c06d7634 (diff)
path changes
git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@449 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
Diffstat (limited to 'recorded.py')
-rw-r--r--recorded.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/recorded.py b/recorded.py
index 108eefd..fbc6139 100644
--- a/recorded.py
+++ b/recorded.py
@@ -90,7 +90,7 @@ class Recorded:
#just taken, so it is in the tempSessionDir
#so load file, convert to pixbuf, and return it here...
thumbPixbuf = None
- thumbFilepath = os.path.join(self.ca.journalPath, self.thumbFilename)
+ thumbFilepath = os.path.join(self.ca.tempPath, self.thumbFilename)
if ( os.path.isfile(thumbFilepath) ):
thumbPixbuf = gtk.gdk.pixbuf_new_from_file(thumbFilepath)
return thumbPixbuf
@@ -114,7 +114,7 @@ class Recorded:
#just taken, so it is in the tempSessionDir
#so load file, convert to pixbuf, and return it here...
thumbPixbuf = None
- thumbFilepath = os.path.join(self.ca.journalPath, self.thumbFilename)
+ thumbFilepath = os.path.join(self.ca.tempPath, self.thumbFilename)
if ( os.path.isfile(thumbFilepath) ):
return thumbFilepath
else:
@@ -129,8 +129,8 @@ class Recorded:
pbl.write(data)
pbl.close()
- #todo: write to tmp (rainbow?) and random unused filename...
- thumbFilepath = os.path.join(self.ca.journalPath, "thumb.png")
+ thumbFilepath = os.path.join( self.ca.tempPath, "thumb.png")
+ thumbFilepath = self.ca.m.getUniqueFilepath(thumbFilepath, 0)
pbl.get_pixbuf().save(thumbFilepath, "png", {} )
return thumbFilepath
@@ -153,7 +153,7 @@ class Recorded:
def getAudioImageFilepath( self ):
if (self.audioImageFilename != None):
- audioFilepath = os.path.join(self.ca.journalPath, self.audioImageFilename)
+ audioFilepath = os.path.join(self.ca.tempPath, self.audioImageFilename)
return os.path.abspath(audioFilepath)
else:
return self.getThumbFilepath()
@@ -165,13 +165,13 @@ class Recorded:
if (not self.buddy):
#just taken by you, so it is in the tempSessionDir
print("getMediaFilepath 3")
- mediaFilepath = os.path.join(self.ca.journalPath, self.mediaFilename)
+ mediaFilepath = os.path.join(self.ca.tempPath, self.mediaFilename)
return os.path.abspath(mediaFilepath)
else:
if (self.downloadedFromBuddy):
print("getMediaFilepath 4")
#the user has requested the high-res version, and it has downloaded
- mediaFilepath = os.path.join(self.ca.journalPath, self.mediaFilename)
+ mediaFilepath = os.path.join(self.ca.tempPath, self.mediaFilename)
return os.path.abspath(mediaFilepath)
else:
print("getMediaFilepath 5")