[Quickrip-cvs] ng base.py,1.3,1.4 config.py,1.1.1.1,1.2

[<te...@us...>]

Update of /cvsroot/quickrip/ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25234

Modified Files:
	base.py config.py 
Log Message:
Made ogmmerge and transcode optional dependencies (base.py & config.py).
Started configuration screen in cli.py and added audio/subtitle language to title screen options.

Index: base.py
===================================================================
RCS file: /cvsroot/quickrip/ng/base.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** base.py	3 Mar 2004 01:45:15 -0000	1.3
--- base.py	4 Mar 2004 02:30:16 -0000	1.4
***************
*** 62,77 ****
  			'mplayer':		['paths',	self.findProgram("mplayer")], \
  			'mencoder':		['paths',	self.findProgram("mencoder")], \
- 			'tcprobe':		['paths',	self.findProgram("tcprobe")], \
  			'transcode':		['paths',	self.findProgram("transcode")], \
! 			#'ogmmerge':		['paths',	self.findProgram("ogmmerge")], \
  			'outputdir':		['paths',	os.path.expanduser("~")], \
  			'dvd_device':		['paths',	os.path.join("/", "dev", "dvd")], \
! 			'deinterlacing':	['vencode',	0], \
  			'aspectratio':		['vencode',	0], \
! 			'videocodec':		['vencode',	0], \
  			'pdamode':		['vencode',	0], \
! 			'audiocodec':		['aencode',	0], \
  			'volumead':		['aencode',	0], \
- 			'audiobitrate':		['aencode',	1] \
  			}
  
--- 62,75 ----
  			'mplayer':		['paths',	self.findProgram("mplayer")], \
  			'mencoder':		['paths',	self.findProgram("mencoder")], \
  			'transcode':		['paths',	self.findProgram("transcode")], \
! 			'ogmmerge':		['paths',	self.findProgram("ogmmerge")], \
  			'outputdir':		['paths',	os.path.expanduser("~")], \
  			'dvd_device':		['paths',	os.path.join("/", "dev", "dvd")], \
! 			'deinterlacing':	['vencode',	'Off'], \
  			'aspectratio':		['vencode',	0], \
! 			'videocodec':		['vencode',	'divx'], \
  			'pdamode':		['vencode',	0], \
! 			'audiocodec':		['aencode',	'mp3'], \
  			'volumead':		['aencode',	0], \
  			}
  
***************
*** 100,104 ****
  			if os.path.isfile(os.path.join(path, program)):
  				return os.path.join(path, program)
! 		self.notify_Error("Couldn't find the program '%s'" % (program))
  
  
--- 98,103 ----
  			if os.path.isfile(os.path.join(path, program)):
  				return os.path.join(path, program)
! 		if program in config.required_programs:
! 			self.notify_Error("Couldn't find the program '%s'" % (program))
  
  
***************
*** 168,175 ****
  				timelabel = (t['length'] / 60)
  			title['timelabel'] = "%s mins" % (timelabel)
  			title['alangs'] = []
  			for a in t['audio']:
  				title['alangs'].append(a['language'])
! 			title['subtitles'] = t['subtitles']
  			self.titles.append(title)
  			self.notify_dispTitle(title)
--- 167,178 ----
  				timelabel = (t['length'] / 60)
  			title['timelabel'] = "%s mins" % (timelabel)
+ 			title['alang'] = 'en'
+ 			title['slang'] = 'None'
  			title['alangs'] = []
  			for a in t['audio']:
  				title['alangs'].append(a['language'])
! 			title['slangs'] = ['None']
! 			for sl in t['subtitles']:
! 				title['slangs'].append(sl)
  			self.titles.append(title)
  			self.notify_dispTitle(title)

Index: config.py
===================================================================
RCS file: /cvsroot/quickrip/ng/config.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.py	1 Mar 2004 17:00:39 -0000	1.1.1.1
--- config.py	4 Mar 2004 02:30:16 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  license = "GNU General Public License (GPL) (see LICENSE file)"
  paths = os.environ['PATH'].split(":")
+ required_programs = ['mplayer', 'mencoder']
  icon = os.path.join("icons", "quickrip.xpm")
  qr_dir = "/usr/share/quickrip"