[Quickrip-cvs] quickrip/gtk gtkmain.py,1.10,1.11 gtksettings.py,1.8,1.9

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

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

Modified Files:
	gtkmain.py gtksettings.py 
Log Message:
Added the ogmmerge setting in preferences.

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gtkmain.py	5 Aug 2003 06:31:55 -0000	1.10
--- gtkmain.py	6 Aug 2003 00:33:48 -0000	1.11
***************
*** 157,162 ****
--- 157,165 ----
  		self.dialogSettings.wteMencoder.set_text(self.config['mencoder'])
  		self.dialogSettings.wteTcprobe.set_text(self.config['tcprobe'])
+ 		self.dialogSettings.wteOgmmerge.set_text(self.config['ogmmerge'])
+ 
  		self.dialogSettings.wteDVD.set_text(self.config['dvd_device'])
  		self.dialogSettings.wteOutput.set_text(self.config['outputdir'])
+ 
  		self.dialogSettings.wteLog.set_text(self.config['logfile'])
  		self.dialogSettings.wcbLogLevel.entry.set_text(self.config['loglevel'])
***************
*** 177,180 ****
--- 180,184 ----
  		self.parser.set('programs', 'mencoder', self.config['mencoder'])
  		self.parser.set('programs', 'tcprobe', self.config['tcprobe'])
+ 		self.parser.set('programs', 'ogmmerge', self.config['ogmmerge'])
  		self.parser.set('general', 'dvd_device', self.config['dvd_device'])
  		self.parser.set('general', 'outputdir', self.config['outputdir'])
***************
*** 202,209 ****
--- 206,217 ----
  		config['mencoder'] = parser.get("programs", "mencoder")
  		config['tcprobe'] = parser.get("programs", "tcprobe")
+ 		config['ogmmerge'] = parser.get("programs", "ogmmerge")
+ 
  		config['dvd_device'] = parser.get("general", "dvd_device")
  		config['outputdir'] = parser.get("general", "outputdir")
+ 
  		config['logfile'] = parser.get("logging", "logfile")
  		config['loglevel'] = parser.get("logging", "loglevel")
+ 
  		config['deinterlacing'] = parser.get("video", "deinterlacing")
  		config['aspectratio'] = parser.get("video", "aspectratio")
***************
*** 211,214 ****
--- 219,223 ----
  		config['pdamode'] = parser.get("video", "pdamode")			
  		config['videocodec'] = parser.get("video", "videocodec")
+ 
  		config['audiocodec'] = parser.get("audio", "audiocodec")
  		config['quality'] = parser.get("audio", "quality")
***************
*** 221,225 ****
  		#paths = ['/usr/bin/', '/usr/local/bin/', '/opt/bin/', '/sbin/', '/usr/sbin/', '/bin', '/usr/X11R6/lib/X11/bin']
  		paths = config.paths
! 		mplayer, mencoder, tcprobe, outdir = "", "", "", "/tmp"
  		for path in paths:
  			#if os.path.isfile(path + "mplayer"):
--- 230,234 ----
  		#paths = ['/usr/bin/', '/usr/local/bin/', '/opt/bin/', '/sbin/', '/usr/sbin/', '/bin', '/usr/X11R6/lib/X11/bin']
  		paths = config.paths
! 		mplayer, mencoder, tcprobe, ogmmerge, outdir = "", "", "", "", "/tmp"
  		for path in paths:
  			#if os.path.isfile(path + "mplayer"):
***************
*** 234,237 ****
--- 243,249 ----
  				#tcprobe = path + "tcprobe"
  				tcprobe = os.path.join(path, "tcprobe")
+ 			if os.path.isfile(os.path.join(path, "ogmmerge")):
+ 				#tcprobe = path + "ogmmerge"
+ 				ogmmerge = os.path.join(path, "ogmmerge")
  		if not mplayer:# == "":
  			self.int_configError("mplayer")
***************
*** 240,243 ****
--- 252,257 ----
  		if not tcprobe:# == "":
  			self.int_configError("tcprobe")
+ 		if not ogmmerge:# == "":
+ 			self.int_configError("ogmmerge")
  
  		dvd_device = "/dev/dvd"
***************
*** 257,260 ****
--- 271,275 ----
  		parser.set("programs", "mencoder", mencoder)
  		parser.set("programs", "tcprobe", tcprobe)
+ 		parser.set("programs", "ogmmerge", ogmmerge)
  		parser.set("general", "dvd_device", dvd_device)
  		parser.set("general", "outputdir", outdir)

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gtksettings.py	5 Aug 2003 06:31:55 -0000	1.8
--- gtksettings.py	6 Aug 2003 00:33:48 -0000	1.9
***************
*** 53,56 ****
--- 53,57 ----
  		self.parent.config['mencoder'] = self.wteMencoder.get_text()
  		self.parent.config['tcprobe'] = self.wteTcprobe.get_text()
+ 		self.parent.config['ogmmerge'] = self.wteOgmmerge.get_text()
  		
  		#general
***************
*** 103,106 ****
--- 104,109 ----
  	def findMencoder(self, widget, data=None):
  		self.findGeneric("Location of MEncoder", self.wteMencoder)
+ 	def findOgmmerge(self, widget, data=None):
+ 		self.findGeneric("Location of OGMMerge", self.wteOgmmerge)
  
  	def __init__(self, parent):
***************
*** 113,116 ****
--- 116,120 ----
  		self.wteMencoder = xml.get_widget('textMencoder') #
  		self.wteMplayer = xml.get_widget('textMplayer') #
+ 		self.wteOgmmerge = xml.get_widget('textOgmmerge') #
  		self.wteTcprobe = xml.get_widget('textTcprobe') #
  		self.wcbVideoCodec = xml.get_widget('comboVideoCodec')#
***************
*** 130,133 ****
--- 134,138 ----
  		xml.signal_autoconnect( {'on_mencoder_clicked': self.findMencoder} )
  		xml.signal_autoconnect( {'on_tcprobe_clicked': self.findTcprobe} )
+ 		xml.signal_autoconnect( {'on_ogmmerge_clicked': self.findOgmmerge} )
  		xml.signal_autoconnect( {'on_log_clicked': self.findLog} )