[Quickrip-cvs] quickrip/gtk gtkmain.py,1.24,1.25 gtksettings.py,1.13,1.14

[<iwa...@us...>]

Update of /cvsroot/quickrip/quickrip/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv27190/gtk

Modified Files:
	gtkmain.py gtksettings.py 
Log Message:
Threaded rip somewhat working.

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** gtkmain.py	10 Aug 2003 01:22:04 -0000	1.24
--- gtkmain.py	10 Aug 2003 02:41:16 -0000	1.25
***************
*** 45,48 ****
--- 45,50 ----
  		self.hideRip()
  		self.hideScan()
+ 		self.config['deinterlacing'] = 0
+ 		self.config['aspectratio'] = 0
  		self.ripDVD()
  
***************
*** 287,291 ****
  
  		self.dialogSettings.wcbAudioCodec.entry.set_text(self.config['audiocodec'])
! 		self.dialogSettings.wcbVolume.entry.set_text(self.config['volume'])
  		self.dialogSettings.wcbQuality.entry.set_text(self.config['quality'])
  
--- 289,293 ----
  
  		self.dialogSettings.wcbAudioCodec.entry.set_text(self.config['audiocodec'])
! 		self.dialogSettings.wcbVolume.entry.set_text(self.config['volumead'])
  		self.dialogSettings.wcbQuality.entry.set_text(self.config['quality'])
  
***************
*** 306,310 ****
  		self.parser.set('audio', 'audiocodec', self.config['audiocodec'])
  		self.parser.set('audio', 'quality', self.config['quality'])
! 		self.parser.set('audio', 'volume', self.config['volume'])
  		self.parser.write(open(file, 'w'))
  
--- 308,312 ----
  		self.parser.set('audio', 'audiocodec', self.config['audiocodec'])
  		self.parser.set('audio', 'quality', self.config['quality'])
! 		self.parser.set('audio', 'volumead', self.config['volumead'])
  		self.parser.write(open(file, 'w'))
  
***************
*** 336,340 ****
  		config['audiocodec'] = parser.get("audio", "audiocodec")
  		config['quality'] = parser.get("audio", "quality")
! 		config['volume'] = parser.get("audio", "volume")
  
  		return (config, parser)
--- 338,342 ----
  		config['audiocodec'] = parser.get("audio", "audiocodec")
  		config['quality'] = parser.get("audio", "quality")
! 		config['volumead'] = parser.get("audio", "volumead")
  
  		return (config, parser)
***************
*** 397,401 ****
  		parser.set("audio", "audiocodec", "MP3")
  		parser.set("audio", "quality", "128")
! 		parser.set("audio", "volume", "+0")
  		parser.write(open(file, 'w'))
  
--- 399,403 ----
  		parser.set("audio", "audiocodec", "MP3")
  		parser.set("audio", "quality", "128")
! 		parser.set("audio", "volumead", "+0")
  		parser.write(open(file, 'w'))
  
***************
*** 470,477 ****
  	def ui_dispDVD(self, numtitles):
  		gtk.threads_enter()
! 		print "Found %s titles" % (self.numtitles)
! 		gtk.threads_leave()
! 		self.dialogProgress.setStatus("Scanning titles")
  		self.dialogProgress.setProgress(0.0)
  
  	def ui_dispTitle(self, track):
--- 472,478 ----
  	def ui_dispDVD(self, numtitles):
  		gtk.threads_enter()
! 		self.dialogProgress.setStatus("Found " + str(self.numtitles) + " titles")
  		self.dialogProgress.setProgress(0.0)
+ 		gtk.threads_leave()
  
  	def ui_dispTitle(self, track):
***************
*** 532,540 ****
  	def ui_newPass(self, passtype):
  		self.dialogProgress.setStatus("Performing: " + str(passtype))
- 		print "new pass"
  
  	def ui_updateProgress(self, perc, trem, tpass):
! 		print "%s percent, %s remaining in %s" % (perc, trem, tpass)
! 		self.dialogProgress.setProgress(perc, 2)
  
  	def ui_finishRipping(self):
--- 533,539 ----
  	def ui_newPass(self, passtype):
  		self.dialogProgress.setStatus("Performing: " + str(passtype))
  
  	def ui_updateProgress(self, perc, trem, tpass):
! 		self.dialogProgress.setProgress(float((float(perc) / 100.0)), 2)
  
  	def ui_finishRipping(self):

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gtksettings.py	8 Aug 2003 12:17:05 -0000	1.13
--- gtksettings.py	10 Aug 2003 02:41:16 -0000	1.14
***************
*** 81,85 ****
  		self.parent.config['audiocodec'] = self.wcbAudioCodec.entry.get_text()
  		self.parent.config['quality'] = self.wcbQuality.entry.get_text()
! 		self.parent.config['volume'] = self.wcbVolume.entry.get_text()
  
  		self.parent.writeSettings(self.parent.homefile)
--- 81,85 ----
  		self.parent.config['audiocodec'] = self.wcbAudioCodec.entry.get_text()
  		self.parent.config['quality'] = self.wcbQuality.entry.get_text()
! 		self.parent.config['volumead'] = self.wcbVolume.entry.get_text()
  
  		self.parent.writeSettings(self.parent.homefile)