quickrip-cvs — Digest to track CVS changes

[Quickrip-cvs] quickrip output.py,NONE,1.1

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

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

Added Files:
	output.py 
Log Message:
The output module!


--- NEW FILE: output.py ---
# Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc.
# Distributed under the GNU Public License v2
# $Header: /cvsroot/quickrip/quickrip/output.py,v 1.1 2003/07/11 10:35:00 telex4 Exp $

import os,sys

havecolor=1
dotitles=1

codes={}
codes["reset"]="\x1b[0m"
codes["bold"]="\x1b[01m"

codes["teal"]="\x1b[36;06m"
codes["turquoise"]="\x1b[36;01m"

codes["fuscia"]="\x1b[35;01m"
codes["purple"]="\x1b[35;06m"

codes["blue"]="\x1b[34;01m"
codes["darkblue"]="\x1b[34;06m"

codes["green"]="\x1b[32;01m"
codes["darkgreen"]="\x1b[32;06m"

codes["yellow"]="\x1b[33;01m"
codes["brown"]="\x1b[33;06m"

codes["red"]="\x1b[31;01m"
codes["darkred"]="\x1b[31;06m"

def xtermTitle(mystr):
	if havecolor and dotitles and os.environ.has_key("TERM"):
		myt=os.environ["TERM"]
		if myt in ["xterm","Eterm","aterm","rxvt"]:
			sys.stderr.write("\x1b]1;\x07\x1b]2;"+str(mystr)+"\x07")
			sys.stderr.flush()

def xtermTitleReset():
	if havecolor and dotitles and os.environ.has_key("TERM"):
		myt=os.environ["TERM"]
		xtermTitle(os.environ["TERM"])


def notitles():
	"turn off title setting"
	dotitles=0

def nocolor():
	"turn off colorization"
	havecolor=0
	for x in codes.keys():
		codes[x]=""

def resetColor():
	return codes["reset"]

def ctext(color,text):
	return codes[ctext]+text+codes["reset"]

def bold(text):
	return codes["bold"]+text+codes["reset"]
def white(text):
	return bold(text)

def teal(text):
	return codes["teal"]+text+codes["reset"]
def turquoise(text):
	return codes["turquoise"]+text+codes["reset"]
def darkteal(text):
	return turquoise(text)

def fuscia(text):
	return codes["fuscia"]+text+codes["reset"]
def purple(text):
	return codes["purple"]+text+codes["reset"]

def blue(text):
	return codes["blue"]+text+codes["reset"]
def darkblue(text):
	return codes["darkblue"]+text+codes["reset"]

def green(text):
	return codes["green"]+text+codes["reset"]
def darkgreen(text):
	return codes["darkgreen"]+text+codes["reset"]

def yellow(text):
	return codes["yellow"]+text+codes["reset"]
def brown(text):
	return codes["brown"]+text+codes["reset"]
def darkyellow(text):
	return brown(text)

def red(text):
	return codes["red"]+text+codes["reset"]
def darkred(text):
	return codes["darkred"]+text+codes["reset"]

[Quickrip-cvs] quickrip dvd.py,1.19,1.20

[<jh...@us...>]

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

Modified Files:
	dvd.py 
Log Message:
Removed vratetol option and changed bitrate adjustment back to 0.98. vratetol
doesn't make much difference for one-pass and makes NO difference for two-
and three-pass file sizes.


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** dvd.py	25 Jun 2003 12:51:37 -0000	1.19
--- dvd.py	26 Jun 2003 03:22:10 -0000	1.20
***************
*** 126,130 ****
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.98  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
--- 126,130 ----
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.96  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
***************
*** 294,298 ****
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 294,298 ----
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
***************
*** 342,346 ****
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
--- 342,346 ----
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
***************
*** 421,426 ****
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 421,426 ----
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:

[Quickrip-cvs] quickrip dvd.py,1.18,1.19

[<jh...@us...>]

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

Modified Files:
	dvd.py 
Log Message:
changed calcrate adjustment to 0.98, which falls closer to the typical 
rates given by other bitrate calculators. Our calcs are still on the
conservative side, though (though not by as much).


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dvd.py	25 Jun 2003 04:14:25 -0000	1.18
--- dvd.py	25 Jun 2003 12:51:37 -0000	1.19
***************
*** 126,130 ****
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.96  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
--- 126,130 ----
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.98  # Correction based on addition of credits and usual error
  			return self.rate
  		except:

[Quickrip-cvs] quickrip dvd.py,1.17,1.18

[<jh...@us...>]

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

Modified Files:
	dvd.py 
Log Message:
Added vratetol to vcodec options. Should tame the wide fluctuations in final AVI file size.


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dvd.py	25 Jun 2003 03:45:44 -0000	1.17
--- dvd.py	25 Jun 2003 04:14:25 -0000	1.18
***************
*** 294,298 ****
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 294,298 ----
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
***************
*** 342,346 ****
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
--- 342,346 ----
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
***************
*** 421,426 ****
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 421,426 ----
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:

[Quickrip-cvs] quickrip dvd.py,1.16,1.17

[<jh...@us...>]

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

Modified Files:
	dvd.py 
Log Message:
Removed breakpoint in one-pass encoding


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dvd.py	15 Jun 2003 20:18:13 -0000	1.16
--- dvd.py	25 Jun 2003 03:45:44 -0000	1.17
***************
*** 320,329 ****
  				
  				# Uncomment to test command
! 				string = ""
! 				for bit in all_pass:
! 					bit = "".join([" ", bit])
! 					string = "".join([string, bit])
! 				print string
! 				sys.exit(1)
  
  				self.int_newPass("audio")
--- 320,329 ----
  				
  				# Uncomment to test command
! 				#string = ""
! 				#for bit in all_pass:
! 					#bit = "".join([" ", bit])
! 					#string = "".join([string, bit])
! 				#print string
! 				#sys.exit(1)
  
  				self.int_newPass("audio")

[Quickrip-cvs] quickrip cli.py,1.9,1.10

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

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

Modified Files:
	cli.py 
Log Message:
Removed dependency on module `output'.


Index: cli.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/cli.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cli.py	19 Jun 2003 02:39:24 -0000	1.9
--- cli.py	21 Jun 2003 16:24:10 -0000	1.10
***************
*** 10,36 ****
  """
  try:
!     import sys
! except ImportError:
!     print "Unable to import module sys"
!     raise SystemExit
! 
! try:
!     import os
! except ImportError:
!     print "Unable to import module os"
!     raise SystemExit
! 
! try:
!     import re
! except ImportError:
!     print "Unable to import module re"
!     raise SystemExit
!     
! try:
!     import output
  except ImportError:
!     print "Unable to import module output"
      raise SystemExit
! 
  from dvd import *
  
--- 10,18 ----
  """
  try:
!     import sys, os, re
  except ImportError:
!     print "Unable to import any of sys, os, re modules"
      raise SystemExit
!   
  from dvd import *
  
***************
*** 56,60 ****
          os.system("clear")
          #print "QuickRip v0.6, (C) Tom Chance, 2003" 
!         print output.bold("%s v%s, %s\n" % (__app__, __version__, __copyright__))
          if mode == 'entry':
              self.outdir = self.config['outputdir']
--- 38,43 ----
          os.system("clear")
          #print "QuickRip v0.6, (C) Tom Chance, 2003" 
!         #print output.bold("%s v%s, %s\n" % (__app__, __version__, __copyright__))
!         print "%s v%s, %s\n" % (__app__, __version__, __copyright__)
          if mode == 'entry':
              self.outdir = self.config['outputdir']
***************
*** 62,71 ****
              self.aLanguage = "en"
              self.sLanguage = "None"
!             print output.bold("\nHit enter to scan DVD")
              try:
                  null = raw_input()
                  del null
              except KeyboardInterrupt:
!                 print output.bold("\n\nExiting...")
                  sys.exit(2)
              self.scanDVD()
--- 45,56 ----
              self.aLanguage = "en"
              self.sLanguage = "None"
!             #print output.bold("\nHit enter to scan DVD")
!             print "\nHit enter to scan DVD"
              try:
                  null = raw_input()
                  del null
              except KeyboardInterrupt:
!                 #print output.bold("\n\nExiting...")
!                 print "\n\nExiting..."
                  sys.exit(2)
              self.scanDVD()
***************
*** 73,77 ****
  
          elif mode == 'toplevel':
!             print output.bold("\nTracks on DVD: ((*) means track will be ripped)")
              for track in self.tracks:
                      star = "   "
--- 58,63 ----
  
          elif mode == 'toplevel':
!             #print output.bold("\nTracks on DVD: ((*) means track will be ripped)")
!             print "\nTracks on DVD: ((*) means track will be ripped)"
              for track in self.tracks:
                      star = "   "
***************
*** 101,105 ****
                  passes = 2
              print ""
!             print output.bold("More Settings")
              print ""
              print "Paths:"
--- 87,92 ----
                  passes = 2
              print ""
!             #print output.bold("More Settings")
!             print "More Settings"
              print ""
              print "Paths:"
***************
*** 131,135 ****
          elif mode == 'rip':
              print ""
!             print output.bold("* QuickRip will rip these DVD tracks:")
              trackno = 0
              for track in self.tracks:
--- 118,123 ----
          elif mode == 'rip':
              print ""
!             #print output.bold("* QuickRip will rip these DVD tracks:")
!             print "* QuickRip will rip these DVD tracks:"
              trackno = 0
              for track in self.tracks:
***************
*** 138,147 ****
                      print "Track %2s (%s/%s.avi) at %skbps" % (track['id'], self.outdir, track['name'], track['vbr'])
              if trackno == 0:
!                 print output.bold("You don't seem to have selected any tracks to rip!")
!                 print output.bold("Hit enter to return to the main menu")
                  null = raw_input()
                  del null
                  self.main("toplevel")
!             print output.bold("Hit enter to begin ripping, or 'b' to return to the menu")
              null = raw_input("> ")
              if null == 'b':
--- 126,138 ----
                      print "Track %2s (%s/%s.avi) at %skbps" % (track['id'], self.outdir, track['name'], track['vbr'])
              if trackno == 0:
!                 #print output.bold("You don't seem to have selected any tracks to rip!")
!                 print "You don't seem to have selected any tracks to rip!"
!                 #print output.bold("Hit enter to return to the main menu")
!                 print "Hit enter to return to the main menu"
                  null = raw_input()
                  del null
                  self.main("toplevel")
!             #print output.bold("Hit enter to begin ripping, or 'b' to return to the menu")
!             print "Hit enter to begin ripping, or 'b' to return to the menu"
              null = raw_input("> ")
              if null == 'b':
***************
*** 153,157 ****
      
      def askTrack(self):
!         print output.bold("Enter letter/track number to edit information, or 'r' to start ripping")
          try:
              choice = raw_input("> ")
--- 144,149 ----
      
      def askTrack(self):
!         #print output.bold("Enter letter/track number to edit information, or 'r' to start ripping")
!         print "Enter letter/track number to edit information, or 'r' to start ripping"
          try:
              choice = raw_input("> ")
***************
*** 179,183 ****
              track = self.tracks[choice - 1]
          except:
!             print output.bold("Invalid track number!")
              self.askTrack()
              self.main("track", track)
--- 171,176 ----
              track = self.tracks[choice - 1]
          except:
!             #print output.bold("Invalid track number!")
!             print "Invalid track number!"
              self.askTrack()
              self.main("track", track)
***************
*** 185,192 ****
      def changeDir(self):
          #print ""
!         print output.bold("\nEnter new output directory:")
          path = raw_input("> ")
          if os.path.exists(path) == 0:
!             print output.bold("Invalid directory!")
              self.changeDir()
          else:
--- 178,187 ----
      def changeDir(self):
          #print ""
!         #print output.bold("\nEnter new output directory:")
!         print "\nEnter new output directory:"
          path = raw_input("> ")
          if os.path.exists(path) == 0:
!             #print output.bold("Invalid directory!")
!             print "Invalid directory!"
              self.changeDir()
          else:
***************
*** 196,208 ****
      def changeVolume(self):
          #print ""
!         print output.bold("\nEnter new volume adjustment (0-10):")
          vol = raw_input("> ")
          try:
              vol = int(vol)
          except:
!             print output.bold("Invalid volume adjustment!")
              self.changeVolume()
          if vol < 0 or vol > 10:
!             print output.bold("Invalid volume adjustment!")
              self.changeVolume()         
          self.volumead = vol
--- 191,206 ----
      def changeVolume(self):
          #print ""
!         #print output.bold("\nEnter new volume adjustment (0-10):")
!         print "\nEnter new volume adjustment (0-10):"
          vol = raw_input("> ")
          try:
              vol = int(vol)
          except:
!             #print output.bold("Invalid volume adjustment!")
!             print "Invalid volume adjustment!"
              self.changeVolume()
          if vol < 0 or vol > 10:
!             #print output.bold("Invalid volume adjustment!")
!             print "Invalid volume adjustment!"
              self.changeVolume()         
          self.volumead = vol
***************
*** 214,218 ****
              langs = langs + lang + " "
          #print ""
!         print output.bold("\nEnter audio language (%s)" % (langs))
          langchoice = raw_input("> ")
          success = 0
--- 212,217 ----
              langs = langs + lang + " "
          #print ""
!         #print output.bold("\nEnter audio language (%s)" % (langs))
!         print "\nEnter audio language (%s)" % (langs)
          langchoice = raw_input("> ")
          success = 0
***************
*** 222,226 ****
                  success = 1
          if success == 0:
!             print output.bold("Invalid language!")
              self.changeALang()
          del success, lang, langchoice
--- 221,226 ----
                  success = 1
          if success == 0:
!             #print output.bold("Invalid language!")
!             print "Invalid language!"
              self.changeALang()
          del success, lang, langchoice
***************
*** 233,237 ****
              langs = langs + lang + " "
          #print ""
!         print output.bold("\nEnter subtitle language (%s)" % (langs))
          langchoice = raw_input("> ")
          success = 0
--- 233,238 ----
              langs = langs + lang + " "
          #print ""
!         #print output.bold("\nEnter subtitle language (%s)" % (langs))
!         print "\nEnter subtitle language (%s)" % (langs)
          langchoice = raw_input("> ")
          success = 0
***************
*** 244,248 ****
              success = 1
          if success == 0:
!             print output.bold("Invalid language!")
              self.changeSLang()
          del success, lang, langchoice
--- 245,250 ----
              success = 1
          if success == 0:
!             #print output.bold("Invalid language!")
!             print "Invalid language!"
              self.changeSLang()
          del success, lang, langchoice
***************
*** 255,259 ****
      def askSettings(self):
          #print ""
!         print output.bold("\nEnter letter to change setting, or 'b' to go back to the track listing")
          choice = raw_input("> ")
  
--- 257,262 ----
      def askSettings(self):
          #print ""
!         #print output.bold("\nEnter letter to change setting, or 'b' to go back to the track listing")
!         print "\nEnter letter to change setting, or 'b' to go back to the track listing"
          choice = raw_input("> ")
  
***************
*** 279,291 ****
              self.main("toplevel")
          else:
!             print output.bold("Invalid operation!")
              self.askSettings()
      
      def changePath(self, type):
          #print ""
!         print output.bold("\nEnter new path for %s:" % (type))
          path = raw_input("> ")
          if not os.path.exists(path):
!             print output.bold("Invalid path!")
              self.changePath(type)
          self.config[type] = path
--- 282,297 ----
              self.main("toplevel")
          else:
!             #print output.bold("Invalid operation!")
!             print "Invalid operation!"
              self.askSettings()
      
      def changePath(self, type):
          #print ""
!         #print output.bold("\nEnter new path for %s:" % (type))
!         print "\nEnter new path for %s:" % (type)
          path = raw_input("> ")
          if not os.path.exists(path):
!             #print output.bold("Invalid path!")
!             print "Invalid path!"
              self.changePath(type)
          self.config[type] = path
***************
*** 294,298 ****
      def changeDeinterlacing(self):
          #print ""
!         print output.bold("\nEnter interlacing option:")
          for key in self.dio.keys():
              print "(%s) %s" % (str(key), self.dio[key])
--- 300,305 ----
      def changeDeinterlacing(self):
          #print ""
!         #print output.bold("\nEnter interlacing option:")
!         print "\nEnter interlacing option:"
          for key in self.dio.keys():
              print "(%s) %s" % (str(key), self.dio[key])
***************
*** 303,307 ****
              null = self.dio[choice]
          except:
!             print output.bold("Invalid option!")
          self.changeDeinterlacing()
          self.config['deinterlacing'] = choice
--- 310,315 ----
              null = self.dio[choice]
          except:
!             #print output.bold("Invalid option!")
!             print "Invalid option!"
          self.changeDeinterlacing()
          self.config['deinterlacing'] = choice
***************
*** 310,314 ****
      def changeAspectRatio(self):
          #print ""
!         print output.bold("\nEnter aspect ratio:")
          for key in self.aro.keys():
              print "(%s) %s" % (str(key), self.aro[key])
--- 318,323 ----
      def changeAspectRatio(self):
          #print ""
!         #print output.bold("\nEnter aspect ratio:")
!         print "\nEnter aspect ratio:"
          for key in self.aro.keys():
              print "(%s) %s" % (str(key), self.aro[key])
***************
*** 317,330 ****
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          try:
              choice = int(choice)
          except ValueError, error_message:
!             print output.bold("Invalid value:", error_message)
          try:
              null = self.aro[choice]
          except:
!             print output.bold("Invalid ratio!")
              self.changeAspectRatio()
          self.config['aspectratio'] = choice
--- 326,342 ----
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          try:
              choice = int(choice)
          except ValueError, error_message:
!             #print output.bold("Invalid value:", error_message)
!             print "Invalid value:", error_message
          try:
              null = self.aro[choice]
          except:
!             #print output.bold("Invalid ratio!")
!             print "Invalid ratio!"
              self.changeAspectRatio()
          self.config['aspectratio'] = choice
***************
*** 333,348 ****
      def changePasses(self):
          #print ""
!         print output.bold("\nEnter number of passes (see online documentation) (1, 2 or 3):")
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          try:
              choice = int(choice)
          except ValueError, error_message:
!             print output.bold("Invalid value:", error_message)
          if choice < 1 or choice > 3:
!             print output.bold("Invalid number!")
              self.changePasses()
          self.config['passes'] = choice
--- 345,364 ----
      def changePasses(self):
          #print ""
!         #print output.bold("\nEnter number of passes (see online documentation) (1, 2 or 3):")
!         print "\nEnter number of passes (see online documentation) (1, 2 or 3):"
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          try:
              choice = int(choice)
          except ValueError, error_message:
!             #print output.bold("Invalid value:", error_message)
!             print "Invalid value:", error_message
          if choice < 1 or choice > 3:
!             #print output.bold("Invalid number!")
!             print "Invalid number!"
              self.changePasses()
          self.config['passes'] = choice
***************
*** 350,361 ****
      
      def changePDAMode(self):
!         print output.bold("\nPDA Mode: (yes/no):")
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          if choice not in ['yes', 'no']:
!             print output.bold("Invalid option!")
              self.changePDAMode()
          if choice == 'yes':
--- 366,380 ----
      
      def changePDAMode(self):
!         #print output.bold("\nPDA Mode: (yes/no):")
!         print "\nPDA Mode: (yes/no):"
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          if choice not in ['yes', 'no']:
!             #print output.bold("Invalid option!")
!             print "Invalid option!"
              self.changePDAMode()
          if choice == 'yes':
***************
*** 379,388 ****
          self.parser.write(open(self.configfile, 'w'))
          print "* Completed"
!         print output.bold("Press enter to continue")
          try:
              null = raw_input()
              del null
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          self.main("settings")
--- 398,409 ----
          self.parser.write(open(self.configfile, 'w'))
          print "* Completed"
!         #print output.bold("Press enter to continue")
!         print "Press enter to continue"
          try:
              null = raw_input()
              del null
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          self.main("settings")
***************
*** 391,399 ****
      def changeTrack(self, track):
          #print ""
!         print output.bold("\nEnter letter to change information, or 'b' to go back to the track listing")
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          
--- 412,422 ----
      def changeTrack(self, track):
          #print ""
!         #print output.bold("\nEnter letter to change information, or 'b' to go back to the track listing")
!         print "\nEnter letter to change information, or 'b' to go back to the track listing"
          try:
              choice = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          
***************
*** 409,422 ****
              self.main("toplevel")
          else:
!             print output.bold("Invalid operation!")
              self.changeTrack(track)
          
      def changeName(self, track):
          #print ""
!         print output.bold("\nEnter new name:")
          try:
              name = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          track['name'] = name
--- 432,448 ----
              self.main("toplevel")
          else:
!             #print output.bold("Invalid operation!")
!             print "Invalid operation!"
              self.changeTrack(track)
          
      def changeName(self, track):
          #print ""
!         #print output.bold("\nEnter new name:")
!         print "\nEnter new name:"
          try:
              name = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          track['name'] = name
***************
*** 425,438 ****
      def changeSize(self, track):
          #print ""
!         print output.bold("\nEnter new file size (MB):")
          try:
              size = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          try:
              size = int(size)
          except ValueError:
!             print output.bold("Invalid size!")
              self.changeSize(track)
          track['size'] = size
--- 451,467 ----
      def changeSize(self, track):
          #print ""
!         #print output.bold("\nEnter new file size (MB):")
!         print "\nEnter new file size (MB):"
          try:
              size = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          try:
              size = int(size)
          except ValueError:
!             #print output.bold("Invalid size!")
!             print "Invalid size!"
              self.changeSize(track)
          track['size'] = size
***************
*** 442,458 ****
      def changeABR(self, track):
          #print ""
!         print output.bold("\nEnter new audio bitrate (kbps) [64, 96, 128, 160]:")
          try:
              abr = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          try:
              abr = int(abr)
          except:
!             print output.bold("Invalid bitrate!")
              self.changeABR(track)
          if abr != 64 and abr != 96 and abr != 128 and abr != 160:
!             print output.bold("Invalid bitrate!")
              self.changeABR(track)
          track['abr'] = abr
--- 471,491 ----
      def changeABR(self, track):
          #print ""
!         #print output.bold("\nEnter new audio bitrate (kbps) [64, 96, 128, 160]:")
!         print "\nEnter new audio bitrate (kbps) [64, 96, 128, 160]:"
          try:
              abr = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          try:
              abr = int(abr)
          except:
!             #print output.bold("Invalid bitrate!")
!             print "Invalid bitrate!"
              self.changeABR(track)
          if abr != 64 and abr != 96 and abr != 128 and abr != 160:
!             #print output.bold("Invalid bitrate!")
!             print "Invalid bitrate!"
              self.changeABR(track)
          track['abr'] = abr
***************
*** 462,473 ****
      def changeRip(self, track):
          #print ""
!         print output.bold("\nRip track? [yes/no]:")
          try:
              rip = raw_input("> ")
          except KeyboardInterrupt:
!             print output.bold("\n\nExiting...")
              sys.exit(2)
          if rip not in ['yes', 'no']:
!             print output.bold("Invalid option!")
              self.changeRip(track)
          track['rip'] = rip
--- 495,509 ----
      def changeRip(self, track):
          #print ""
!         #print output.bold("\nRip track? [yes/no]:")
!         print "\nRip track? [yes/no]:"
          try:
              rip = raw_input("> ")
          except KeyboardInterrupt:
!             #print output.bold("\n\nExiting...")
!             print "\n\nExiting..."
              sys.exit(2)
          if rip not in ['yes', 'no']:
!             #print output.bold("Invalid option!")
!             print "Invalid option!"
              self.changeRip(track)
          track['rip'] = rip
***************
*** 475,479 ****
  
      def int_configError(self, bin):
!         print output.bold("Configuration error: Unable to find %s, check it is installed" % (bin))
          sys.exit(2)
  
--- 511,516 ----
  
      def int_configError(self, bin):
!         #print output.bold("Configuration error: Unable to find %s, check it is installed" % (bin))
!         print "Configuration error: Unable to find %s, check it is installed" % (bin)
          sys.exit(2)
  

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

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

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

Modified Files:
	cli.py 
Log Message:
Added except clauses to import statements.  Not pretty but it works....  :-\


Index: cli.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/cli.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cli.py	10 Jun 2003 18:39:48 -0000	1.8
--- cli.py	19 Jun 2003 02:39:24 -0000	1.9
***************
*** 9,13 ****
  email:     tom...@gm...
  """
! import sys, os, re, output
  from dvd import *
  
--- 9,36 ----
  email:     tom...@gm...
  """
! try:
!     import sys
[...1077 lines suppressed...]
!         sys.stdout.flush()
  
!         sys.stdout.write("\b" * (7+n))
  
!     def int_finishRipping(self):
!         #print ""
!         print "\n* Ripping finished\nPress enter to return to main menu"
!         try:
!             null = raw_input()
!             del null
!         except KeyboardInterrupt:
!             print "\n\nExiting..."
!             sys.exit(2)
!         self.main("toplevel")
  
  def main():
!     #print "QuickRip v0.6, (C) Tom Chance, 2003"
!     print "%s v%s, %s\n" % (__app__, __version__, __copyright__)    
!     cli = CLI()
!     cli.main()

[Quickrip-cvs] quickrip config.py,1.5,1.6

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

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

Modified Files:
	config.py 
Log Message:
Version bump for CVS code

Index: config.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/config.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.py	13 Jun 2003 20:17:39 -0000	1.5
--- config.py	15 Jun 2003 20:18:35 -0000	1.6
***************
*** 14,18 ****
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.7"
  date = "2003-06-13"
  copyright = "(C) 2003 Tom Chance"
--- 14,18 ----
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.8cvs"
  date = "2003-06-13"
  copyright = "(C) 2003 Tom Chance"

[Quickrip-cvs] quickrip dvd.py,1.15,1.16

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

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

Modified Files:
	dvd.py 
Log Message:
Added new code to cropdetect each track before ripping, and supply proper cropping parameters to -vop string

Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dvd.py	13 Jun 2003 20:18:35 -0000	1.15
--- dvd.py	15 Jun 2003 20:18:13 -0000	1.16
***************
*** 171,175 ****
  		self.int_dispDVD()
  
! 		# Run through tracks looking for playback times and chapters
  		for i in range(int(self.numtitles) + 1):
  			if i > 0:
--- 171,175 ----
  		self.int_dispDVD()
  
! 		# Run through tracks looking for playback times, chapters and cropping
  		for i in range(int(self.numtitles) + 1):
  			if i > 0:
***************
*** 199,203 ****
  						numchapters = regexp_chap.search(line).group(1)
  					#elif regexp_scale.search(line):
! 					#	scale = regexp_scale.search(line).group(1)
  
  				# Clean up title
--- 199,204 ----
  						numchapters = regexp_chap.search(line).group(1)
  					#elif regexp_scale.search(line):
! 					#	scale = regexp_scale.search(line).group(1)	
! 		
  
  				# Clean up title
***************
*** 264,267 ****
--- 265,289 ----
  			if (self.volumead is not "0"):
  				self.vol = "".join([":vol=", self.volumead])
+ 				
+ 			# Look for cropping
+ 			sstep = int(self.track['time']) / 31
+ 			if not sstep:
+ 				sstep = 1
+ 			cmd = "".join(["mplayer -dvd ", str(self.track['id']), " -vop cropdetect -nosound -vo null -frames 10 -sstep ", str(sstep), " 2>/dev/null"])
+ 			text = os.popen(cmd).readlines()
+ 			regexp = re.compile('.*-vop crop=(\d*:\d*:\d*:\d*).*')
+ 			crop_options = {}
+ 			common_crop = ""
+ 			cc_hits = 0
+ 			for line in text:
+ 				if regexp.search(line):
+ 					crop = regexp.search(line).group(1)
+ 					try:
+ 						crop_options[crop] = crop_options[crop] + 1
+ 						if crop_options[crop] > cc_hits:
+ 							common_crop = crop
+ 					except:
+ 						crop_options[crop] = 1
+ 			self.track['crop'] = common_crop
  
  			pipe_perc = re.compile('.*f \((.\d)\%\)*')
***************
*** 272,276 ****
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "scale,cropdetect", "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 294,298 ----
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
***************
*** 297,307 ****
  					all_pass.insert(4, self.sLanguage)
  				
! # 				# Uncomment to test command
! # 				string = ""
! # 				for bit in all_pass:
! # 					bit = "".join([" ", bit])
! # 					string = "".join([string, bit])
! # 				print string
! # 				sys.exit(1)
  
  				self.int_newPass("audio")
--- 319,329 ----
  					all_pass.insert(4, self.sLanguage)
  				
! 				# Uncomment to test command
! 				string = ""
! 				for bit in all_pass:
! 					bit = "".join([" ", bit])
! 					string = "".join([string, bit])
! 				print string
! 				sys.exit(1)
  
  				self.int_newPass("audio")
***************
*** 320,324 ****
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "scale,cropdetect", "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
--- 342,346 ----
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
***************
*** 399,404 ****
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "scale,cropdetect", "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "scale,cropdetect", "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 421,426 ----
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:

[Quickrip-cvs] quickrip README,1.2,1.3

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

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

Modified Files:
	README 
Log Message:
Minor changes for release of 0.7

Index: README
===================================================================
RCS file: /cvsroot/quickrip/quickrip/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	11 May 2003 15:07:04 -0000	1.2
--- README	13 Jun 2003 20:20:40 -0000	1.3
***************
*** 1,3 ****
! QuickRip v0.6 README
  -------------------
  
--- 1,3 ----
! QuickRip v0.7 README
  -------------------
  
***************
*** 38,44 ****
  /usr/share/quickrip/quickrip.py to /usr/bin/quickrip, like so:
  
!   hostname$ mkdir /usr/share/quickrip
    hostname$ cp *.py *.ui LICENSE README quickriprc /usr/share/quickrip
!   hostname$ ln -s /usr/share/quickrip/quickrip.py /usr/bin/quickrip
  
  
--- 38,44 ----
  /usr/share/quickrip/quickrip.py to /usr/bin/quickrip, like so:
  
!   hostname$ mkdir -p /usr/share/quickrip
    hostname$ cp *.py *.ui LICENSE README quickriprc /usr/share/quickrip
!   hostname$ ln -sf /usr/share/quickrip/quickrip.py /usr/bin/quickrip
  
  
***************
*** 47,67 ****
  --------------
  hostname$ quickrip --help
! QuickRip v0.6, (C) Tom Chance, 2003
  
! Usage: quickrip [options]
  
! Options:
!         With none, runs PyQt GUI mode
!         --help          print this help message
!         -cli            run in command line interface mode
!         -autoresize     automatically resize the cli progress bar as
!                         the terminal is resized (small performance hit)
  
  Hopefully it's very easy and obvious to use GUI QuickRip - that is the main purpose
! afterall. Basically, you hit the "Scan DVD" button, wait until it's finished, 
! then select the tracks you want to rip, and set the options for how they will 
! be ripped. Each track will have its own set of options, so you need to select 
! each track and set its options in turn. You can change the names of tracks 
! by right-clicking on their name at present (by default: 01, 02, etc.)
  
  Once you're ready, hit the "Rip DVD" button, and then click on "Start". You can 
--- 47,66 ----
  --------------
  hostname$ quickrip --help
! QuickRip v0.7, (C) Tom Chance, 2003
  
! Usage: /usr/bin/quickrip [options]
  
! Options:  (with none, runs PyQt GUI mode)
!     -h, --help              print this help message
!     -c, --cli                 run in command line interface mode
!     -a, --autoresize     automatically resize the cli progress bar as
!                                 the terminal is resized (small performance hit)
  
  Hopefully it's very easy and obvious to use GUI QuickRip - that is the main purpose
! afterall. Basically, you "Scan DVD", wait until it's finished, then select the tracks 
! you want to rip, and set the options for how they will be ripped. Each track will 
! have its own set of options, so you need to select each track and set its options 
! in turn. You can change the names of tracks by right-clicking on their name at 
! present (by default: 01, 02, etc.)
  
  Once you're ready, hit the "Rip DVD" button, and then click on "Start". You can 
***************
*** 80,84 ****
  QuickRip is bound not to do exactly what you want it to do, and you might even 
  have problems using it, so if you have any suggestions of how I could 
! improve it, or any bugs t oreport, give me your ideas! Details can be 
  found on the QuickRip web page:
  
--- 79,83 ----
  QuickRip is bound not to do exactly what you want it to do, and you might even 
  have problems using it, so if you have any suggestions of how I could 
! improve it, or any bugs to report, give me your ideas! Details can be 
  found on the QuickRip web page:
  

[Quickrip-cvs] quickrip quickriprc,1.1.1.1,1.2

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

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

Modified Files:
	quickriprc 
Log Message:
Updated for new settings, with helpful comments should people wish to edit the text files directly
(this is a copy that is put into /usr/share/quickrip and so should remain untouched for reference)

Index: quickriprc
===================================================================
RCS file: /cvsroot/quickrip/quickrip/quickriprc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** quickriprc	29 Apr 2003 11:13:34 -0000	1.1.1.1
--- quickriprc	13 Jun 2003 20:19:50 -0000	1.2
***************
*** 1,10 ****
  [paths]
! outputdir = /home/tom/tmp
  tcprobe = /usr/bin/tcprobe
  mplayer = /usr/bin/mplayer
  mencoder = /usr/bin/mencoder
  
  [mencoder]
  aspectratio = 0
  deinterlacing = 0
  
--- 1,43 ----
+ """
+ quickriprc - Example config file with comments
+ 
+ copyright: (C) 2003, Tom Chance
+ license:   GNU General Public License (GPL) (see LICENSE file)
+ web:       http://quickrip.sf.net
+ email:     tom...@gm...
+ """
+ 
  [paths]
! # Default output directory for created movie files
! outputdir = /home/tom
! 
! # Paths to binaries
  tcprobe = /usr/bin/tcprobe
  mplayer = /usr/bin/mplayer
  mencoder = /usr/bin/mencoder
  
+ 
  [mencoder]
+ # Aspect ratio for DVD
+ #   (0 = default, 4:3
+ #    1 = 4:3
+ #    2 = 16:19
+ #    3 = 2.35:1
  aspectratio = 0
+ 
+ # De-interlacing options
+ #   (0 = none
+ #    1 = -vop dint
+ #    2 = -vop il
+ #    3 = -vop lavcdeint
+ #    4 = -vop pp=lb
  deinterlacing = 0
  
+ # Number of mencoder passes
+ # Can be 1, 2 or 3
+ passes = 3
+ 
+ #PDA mode (changes output resolution to suitable for PDAs)
+ # 0 = off
+ # 1 = on
+ pdamode = 0
\ No newline at end of file

[Quickrip-cvs] quickrip dvd.py,1.14,1.15

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

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

Modified Files:
	dvd.py 
Log Message:
Minor changes for resolutions etc. to fix up for 0.7

Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dvd.py	10 Jun 2003 23:37:02 -0000	1.14
--- dvd.py	13 Jun 2003 20:18:35 -0000	1.15
***************
*** 138,142 ****
  		# Find number of tracks, audio languages and subtitle languages with MPlayer
  		self.numtitles = 0
- 		#cmd_mplayer = str(self.config['mplayer']) + ' -v dvd:// -identify -quiet -nocache 2>/dev/null'
  		cmd_mplayer = "".join([str(self.config['mplayer']), ' -v dvd:// -identify -quiet -nocache 2>/dev/null'])
  		text = os.popen(cmd_mplayer).readlines()
--- 138,141 ----
***************
*** 203,207 ****
  
  				# Clean up title
- 				#if i < 10: title_label = "0" + str(i)
  				if i < 10: title_label = "".join(["0", str(i)])
  				else: title_label = str(i)
--- 202,205 ----
***************
*** 247,254 ****
  		
  		# Check PDA mode (universal to all ripping methods)
! 		if self.config['pdamode'] == 0:
  			resolution = "720"
  		else:
! 			resolution = "160" #*****************
  
  		# Run through selected tracks ripping each one
--- 245,252 ----
  		
  		# Check PDA mode (universal to all ripping methods)
! 		if int(self.config['pdamode']) == 0:
  			resolution = "720"
  		else:
! 			resolution = "320"
  
  		# Run through selected tracks ripping each one
***************
*** 299,303 ****
  					all_pass.insert(4, self.sLanguage)
  				
! 				# Uncomment to test command
  # 				string = ""
  # 				for bit in all_pass:
--- 297,301 ----
  					all_pass.insert(4, self.sLanguage)
  				
! # 				# Uncomment to test command
  # 				string = ""
  # 				for bit in all_pass:

[Quickrip-cvs] quickrip config.py,1.4,1.5

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

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

Modified Files:
	config.py 
Log Message:
Bumped version number to 0.7 for release

Index: config.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/config.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.py	12 May 2003 13:37:08 -0000	1.4
--- config.py	13 Jun 2003 20:17:39 -0000	1.5
***************
*** 1,14 ****
  #! /usr/bin/env python
  
  import os
  
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.7cvs"
! date = "2003-05-07"
  copyright = "(C) 2003 Tom Chance"
  license = "GNU General Public License (GPL) (see LICENSE file)"
  dvd_device = os.path.join("/", "dev", "dvd")
! paths = ['/usr/bin/', '/usr/local/bin/', '/opt/bin/', '/sbin/', '/usr/sbin/', '/bin', '/usr/X11R6/lib/X11/bin']
  icon = os.path.join("icons", "quickrip.xpm")
  qr_dir = "/usr/share/quickrip"
--- 1,23 ----
  #! /usr/bin/env python
  
+ """
+ config.py - Global objects configuration file
+ 
+ copyright: (C) 2003, Tom Chance
+ license:   GNU General Public License (GPL) (see LICENSE file)
+ web:       http://quickrip.sf.net
+ email:     tom...@gm...
+ """
+ 
  import os
  
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.7"
! date = "2003-06-13"
  copyright = "(C) 2003 Tom Chance"
  license = "GNU General Public License (GPL) (see LICENSE file)"
  dvd_device = os.path.join("/", "dev", "dvd")
! paths = ['/bin', '/usr/bin/', '/usr/local/bin/', '/opt/bin/', '/sbin/', '/usr/sbin/', '/usr/X11R6/lib/X11/bin']
  icon = os.path.join("icons", "quickrip.xpm")
  qr_dir = "/usr/share/quickrip"