[Quickrip-cvs] quickrip base.py,1.8,1.9

[<je...@us...>]

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

Modified Files:
	base.py 
Log Message:

Changed int_* to ui_*



Index: base.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/base.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** base.py	7 Aug 2003 19:01:54 -0000	1.8
--- base.py	8 Aug 2003 00:30:01 -0000	1.9
***************
*** 140,144 ****
  			if os.path.isfile(os.path.join(path, program)):
  				return os.path.join(path, program)
! 		self.int_configError(program)
  
  
--- 140,144 ----
  			if os.path.isfile(os.path.join(path, program)):
  				return os.path.join(path, program)
! 		self.ui_configError(program)
  
  
***************
*** 203,207 ****
  	def up_DVDInfo(self, line):
  		if self.re_error.search(line):
! 			self.int_noTitles()
  		elif self.re_title.search(line):
  			self.numtitles = int(re_title.search(line).group(1))
--- 203,207 ----
  	def up_DVDInfo(self, line):
  		if self.re_error.search(line):
! 			self.ui_noTitles()
  		elif self.re_title.search(line):
  			self.numtitles = int(re_title.search(line).group(1))
***************
*** 224,228 ****
  		for line in self.run('tcprobe', arguments):
  			if re_error.search(line):
! 				self.int_noTitles()
  				return
  			if re_time.search(line):
--- 224,228 ----
  		for line in self.run('tcprobe', arguments):
  			if re_error.search(line):
! 				self.ui_noTitles()
  				return
  			if re_time.search(line):
***************
*** 250,254 ****
  	def scanDVD(self):
  		"""Scan the DVD and build up a data structure for the titles"""
! 		self.int_startScanning()
  
  		# Reset values to default (in case user scans two different discs in same session)
--- 250,254 ----
  	def scanDVD(self):
  		"""Scan the DVD and build up a data structure for the titles"""
! 		self.ui_startScanning()
  
  		# Reset values to default (in case user scans two different discs in same session)
***************
*** 260,264 ****
  		if self.numtitles is 0:
  			return
! 		self.int_dispDVD(self.numtitles)
  
  		for i in range(int(self.numtitles) + 1):
--- 260,264 ----
  		if self.numtitles is 0:
  			return
! 		self.ui_dispDVD(self.numtitles)
  
  		for i in range(int(self.numtitles) + 1):
***************
*** 288,299 ****
  				self.titles.append(title)
  
! 				self.int_dispTitle(title)
  
! 		self.int_finishScanning()
  
  
  	def ripDVD(self):
  		"""Rip the DVD titles based on gathered settings"""
! 		self.int_startRipping()
  		self.state = "ripping"
  
--- 288,299 ----
  				self.titles.append(title)
  
! 				self.ui_dispTitle(title)
  
! 		self.ui_finishScanning()
  
  
  	def ripDVD(self):
  		"""Rip the DVD titles based on gathered settings"""
! 		self.ui_startRipping()
  		self.state = "ripping"
  
***************
*** 318,322 ****
  		i = 0
  		for title in self.torip:
! 			self.int_newTitle(title['name'], i, self.numrips, title['vbr'])
  			i = i + 1
  
--- 318,322 ----
  		i = 0
  		for title in self.torip:
! 			self.ui_newTitle(title['name'], i, self.numrips, title['vbr'])
  			i = i + 1
  
***************
*** 367,376 ****
  				perc = re_progress.search(line).group(1)
  				trem = re_progress.search(line).group(2)
! 				self.int_updateProgress(perc, trem, passtype)
  
  
  	def mp3Audio(self, title):
  		"""Rip the audio from a DVD title and encode as MP3"""
! 		self.int_newPass("mp3audio")
  
  		try:
--- 367,376 ----
  				perc = re_progress.search(line).group(1)
  				trem = re_progress.search(line).group(2)
! 				self.ui_updateProgress(perc, trem, passtype)
  
  
  	def mp3Audio(self, title):
  		"""Rip the audio from a DVD title and encode as MP3"""
! 		self.ui_newPass("mp3audio")
  
  		try:
***************
*** 400,404 ****
  	def aviVideo(self, title, output, resolution, merge=1):
  		"""Rip the video from a DVD title, and optionally merge with audio"""
! 		self.int_newPass("video")
  
  		if self.config['videocodec']:
--- 400,404 ----
  	def aviVideo(self, title, output, resolution, merge=1):
  		"""Rip the video from a DVD title, and optionally merge with audio"""
! 		self.ui_newPass("video")
  
  		if self.config['videocodec']:
***************
*** 450,480 ****
  	## INHERIT THE CLASS AND SUBSTITUE THESE CLASS METHODS WITH YOUR
  	## OWN UI HOOKS
! 	def int_startScanning(self):
  		pass
  
! 	def int_noTitles(self):
  		pass
  
! 	def int_dispDVD(self, numtitles):
  		pass
  
! 	def int_dispTitle(self, title):
  		pass
  
! 	def int_finishScanning(self):
  		pass
  
! 	def int_startRipping(self):
  		pass
  
! 	def int_newTitle(self, name, number, total, vbr):
  		pass
  
! 	def int_newPass(self, passtype):
  		pass
  
! 	def int_updateProgress(self, perc, trem, tpass):
  		pass
  
! 	def int_finishRipping(self):
  		pass
--- 450,480 ----
  	## INHERIT THE CLASS AND SUBSTITUE THESE CLASS METHODS WITH YOUR
  	## OWN UI HOOKS
! 	def ui_startScanning(self):
  		pass
  
! 	def ui_noTitles(self):
  		pass
  
! 	def ui_dispDVD(self, numtitles):
  		pass
  
! 	def ui_dispTitle(self, title):
  		pass
  
! 	def ui_finishScanning(self):
  		pass
  
! 	def ui_startRipping(self):
  		pass
  
! 	def ui_newTitle(self, name, number, total, vbr):
  		pass
  
! 	def ui_newPass(self, passtype):
  		pass
  
! 	def ui_updateProgress(self, perc, trem, tpass):
  		pass
  
! 	def ui_finishRipping(self):
  		pass