Added additional GIT commands to the README file

Changed default values in rip_dvd.conf.dist file
Improved rip_dvd.conf finding algorithm (added /etc and $PWD as locations)
Added file exists check when -n option is given, deprecating finding the
file in the tmpdir if it does not exist when specified with the -n option.

diff --git a/README b/README
index dd7efa30e5f71cbd1d696a033c0509b059e2231f..e13e50dedfdf3bd2d9fe76d5539eb4ac494815d3 100644 (file)
--- a/README
+++ b/README
@@ -25,6 +25,9 @@ To pull updates in the future of this project into your local directory:
 > cd rip_dvd
 > git pull origin
 
+To see the changelog for what you have pulled, run this command:
+> git whatchanged
+
 ----------------------------------------------
 ENABLING XVID TO ENCODE USING MULTICORES
 ----------------------------------------------

diff --git a/rip_dvd b/rip_dvd
index 754cda7c6d16746f3b8161ab17a32563d8bc9059..9e13ae37042121c2e18148ca20c972a190224a4b 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -69,8 +69,27 @@ typeset -i mplayer_dumpstream_incompatibility=0
 # in a way that won't get clobbered when you pull updates from my GIT repo.
 ##############################################################################
 config="${0%/*}/rip_dvd.conf"
-[ -e "${config}.dist" ] && . ${config}.dist
-[ -e "${config}" ] && . ${config}
+
+# The config file will be searched for in the following location order:
+found_config=0
+
+# 1) /path/to/rip_dvd/script/rip_dvd.conf.dist
+[ -e "${config}.dist" ] && found_config=1 && . ${config}.dist
+
+# 2) /path/to/rip_dvd/script/rip_dvd.conf
+[ -e "${config}" ] && found_config=1 && . ${config}
+
+# 3) /etc/rip_dvd.conf
+[ -e "/etc/rip_dvd.conf" ] && found_config=1 && . /etc/rip_dvd.conf
+
+# 4) $PWD/rip_dvd.conf
+[ -e "rip_dvd.conf" ] && found_config=1 && . rip_dvd.conf
+
+# Check to make sure we found the config file
+if [ $found_config -eq 0 ]; then
+  echo "-E- Unable to find the rip_dvd.conf file: $config"
+  exit 1
+fi
 
 ##############################################################################################
 # Command line processing
@@ -111,10 +130,9 @@ function usage() {
     echo >&2 "   -d <destdir>  Specify the destination directory to store the ripped DVD to"
     echo >&2 "   -n <dvdname>  Specify a path to a DVD folder or file to process:"
     echo >&2 "                 1) If this option is not specified, the DVD will be ripped from $dev"
-    echo >&2 "                 2) If dvdname exists in $tmpdir, it will be ripped as a DVD instead of $dev"
-    echo >&2 "                 3) If dvdname is a full path to a DVD folder, it will be ripped as a DVD instead of $dev"
-    echo >&2 "                 4) If dvdname is a full path to an MPG2 file, it will be ripped as a DVD instead of $dev"
-    echo >&2 "                 5) If dvdname is a full path to an ISO file, it will be ripped as a DVD instead of $dev"
+    echo >&2 "                 2) If dvdname is a full path to a DVD folder, it will be ripped as a DVD instead of $dev"
+    echo >&2 "                 3) If dvdname is a full path to an MPG2 file, it will be ripped as a DVD instead of $dev"
+    echo >&2 "                 4) If dvdname is a full path to an ISO file, it will be ripped as a DVD instead of $dev"
     echo >&2 "   -p <profile>  Specify which encoding profile to use in -x mode as shown below:"
     echo >&2 "                 - xvidvhq = AVI, very high quality encoding, Xvid codec, 2 pass encoding (default)"
     echo >&2 "                 - xvidhq = AVI, high quality encoding, Xvid codec, 2 pass encoding"
@@ -220,6 +238,7 @@ fi
 
 typeset -i ripdvd
 if [ -z "$dvdname" ]; then
+
   # make sure the DVD device is accessible
   volname $dev > /dev/null 2>&1
   if [ $? != 0 ]; then
@@ -229,7 +248,9 @@ if [ -z "$dvdname" ]; then
   # now capture the volume name from the device
   dvdname=`volname $dev | awk '{ print $1 }'`
   ripdvd=1
+
 else 
+
   # check to see if dvdname is a full path to a real directory
   # if it is, set dvdname and dvdpath appropriately
   if [ -d "$dvdname" ]; then
@@ -279,10 +300,19 @@ else
       echo "-E- Unsupported file type: $vobfile"
       exit 1
     fi
+
+  # Throw an error if we can't find what the -n option is pointing to
+  else 
+    echo "-E- Unable to find the directory or file specified by the '-n $dvdname' option. Please make sure the path is valid."
+    exit 1
   fi
+
+  # Set the ripdvd flag to false since we aren't ripping a DVD disk
   ripdvd=0
-  # Since we aren't ripping a DVD disk, don't eject anything
+
+  # Since we aren't ripping a DVD disk, don't eject anything either
   eject_disk=0
+
 fi
 
 # remove bad characters from the dvdname
@@ -507,13 +537,13 @@ function encode_vob_file {
       #mencoder_audioch_opts[1]="-af channels=6"
       #mencoder_audioch_opts[2]=""
       mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
-      mencoder_audioch_opts[0]="-channels 6 -srate 48000"
+      mencoder_audioch_opts[0]="-channels 6 -srate 48000 -af volnorm=1"
     else
       # These options produce good 2 channel audio for linux and windows (including the internal mythvideo player)
       #mencoder_audio_opts="-oac mp3lame -lameopts cbr:br=$audio_bitrate"
       #mencoder_audioch_opts[0]=""
       mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
-      mencoder_audioch_opts[0]="-channels 2 -srate 48000"
+      mencoder_audioch_opts[0]="-channels 2 -srate 48000 -af volnorm=1"
     fi
 
   fi
@@ -1330,4 +1360,4 @@ if [ $mirror_mode -eq 0 ]; then
 
 fi
 
-##############################################################################################
\ No newline at end of file
+##############################################################################################

diff --git a/rip_dvd.conf.dist b/rip_dvd.conf.dist
index da1dad64cabcadc8bfbf7d91fae7c3786142ac8b..c05e4b4a2b8db4143acf1cbbe09a4a3f7c25187b 100644 (file)
--- a/rip_dvd.conf.dist
+++ b/rip_dvd.conf.dist
@@ -10,7 +10,7 @@
 ripcmd="/myth/video/bin/rip_dvd"
 
 # Specify the device path to the DVD drive
-dev=/dev/dvd2
+dev=/dev/dvd
 
 # Specify the path to the log directory 
 logdir=/var/log/ripdvd
@@ -22,7 +22,7 @@ tmpdir=/myth/video/DVDs/.ripdvd
 mailto=root
 
 # Setup the path to the tools needed by this ripper
-PATH=/etc/mythtv/bin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:.:$PATH
+PATH=/etc/mythtv/bin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/usr/share/tovid:.:$PATH
 
 # Use mplayer dumpstream to create the main VOB file
 # If set to 0, cat and other utils will be used to make it instead.