From 33c9514b75686e41823ed5bbb2f8f328a1aa0f38 Mon Sep 17 00:00:00 2001
From: Keine_Ahnung <no@mail.com>
Date: Tue, 25 Dec 2012 17:27:22 +0100
Subject: renamed vdr-eject to vdr-opticaldrive

---
 commands/vdr-eject        | 40 ----------------------------------------
 commands/vdr-opticaldrive | 40 ++++++++++++++++++++++++++++++++++++++++
 commands/vdr-ripit        | 14 +++++++-------
 3 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 commands/vdr-eject
 create mode 100644 commands/vdr-opticaldrive

diff --git a/commands/vdr-eject b/commands/vdr-eject
deleted file mode 100644
index 475ca2d..0000000
--- a/commands/vdr-eject
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-dvd_dev="/dev/dvd"
-
-mode="$1"
-
-case "$mode" in
-	toggle)
-		eject -T "$dvd_dev"
-	;;
-	open)
-		eject "$dvd_dev"
-	;;
-	close)
-		eject -t "$dvd_dev"
-	;;
-	lock)
-		eject -i on "$dvd_dev"
-	;;
-	unlock)
-		eject -i off "$dvd_dev"
-	;;
-	startburn)
-		eject -t "$dvd_dev"
-	;;
-	stopburn)
-		eject "$dvd_dev"
-	;;
-	getopentime)
-		printf "10"
-	;;
-	getdvddev)
-		printf "$dvd_dev"
-	;;
-	*)
-		printf "Usage: $(basename "$0") {toggle|open|close|startburn|stopburn|getdvddev|getopentime}\n" >&2
-	;;
-esac
-
-exit 0
diff --git a/commands/vdr-opticaldrive b/commands/vdr-opticaldrive
new file mode 100644
index 0000000..475ca2d
--- /dev/null
+++ b/commands/vdr-opticaldrive
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+dvd_dev="/dev/dvd"
+
+mode="$1"
+
+case "$mode" in
+	toggle)
+		eject -T "$dvd_dev"
+	;;
+	open)
+		eject "$dvd_dev"
+	;;
+	close)
+		eject -t "$dvd_dev"
+	;;
+	lock)
+		eject -i on "$dvd_dev"
+	;;
+	unlock)
+		eject -i off "$dvd_dev"
+	;;
+	startburn)
+		eject -t "$dvd_dev"
+	;;
+	stopburn)
+		eject "$dvd_dev"
+	;;
+	getopentime)
+		printf "10"
+	;;
+	getdvddev)
+		printf "$dvd_dev"
+	;;
+	*)
+		printf "Usage: $(basename "$0") {toggle|open|close|startburn|stopburn|getdvddev|getopentime}\n" >&2
+	;;
+esac
+
+exit 0
diff --git a/commands/vdr-ripit b/commands/vdr-ripit
index c3a6c20..4acddd5 100644
--- a/commands/vdr-ripit
+++ b/commands/vdr-ripit
@@ -78,7 +78,7 @@ fi
 case "$PARAM_MODE" in
 	kill)
 		touch "$ABORT_FILE"
-		printf "PROCESS MANUALLY ABORTED\nPlease Wait (max. %s Seconds)...\n" "$(vdr-eject getopentime)"
+		printf "PROCESS MANUALLY ABORTED\nPlease Wait (max. %s Seconds)...\n" "$(vdr-opticaldrive getopentime)"
 		for pid in $(pidof perl); do
 			#echo "$(cat /proc/$pid/cmdline | sed 's/\x00/ /g'|sed 's/^perl //')" > /tmp/a
 			#echo "$(cat $LOCK_FILE|sed "s/'//g"|sed 's/^nice -n [[:digit:]]\{2\} //') " > /tmp/b
@@ -93,15 +93,15 @@ case "$PARAM_MODE" in
 			printf "Error, Directory %s not writable\n" "$PARAM_DIR"
 			touch "$ABORT_FILE"
 		fi
-		vdr-eject open
-		printf "Please insert CD... (start in %s Seconds)\n" "$(vdr-eject getopentime)"
-		sleep $(vdr-eject getopentime)
+		vdr-opticaldrive open
+		printf "Please insert CD... (start in %s Seconds)\n" "$(vdr-opticaldrive getopentime)"
+		sleep $(vdr-opticaldrive getopentime)
 		if [ ! -f "$ABORT_FILE" ]; then
-			vdr-eject startburn
+			vdr-opticaldrive startburn
 
 			[ -n "$PARAM_NICE" ] && commandline="$(printf "nice -n '%s' " "$PARAM_NICE")"
 			commandline="${commandline}/usr/bin/ripit"
-			commandline="${commandline}$(printf " --nointeraction --device '%s'" "$(vdr-eject getdvddev)")"
+			commandline="${commandline}$(printf " --nointeraction --device '%s'" "$(vdr-opticaldrive getdev)")"
 			[ -n "$PARAM_VERBOSITY" ] && commandline="${commandline}$(printf " -x '%s'" "$PARAM_VERBOSITY")"
 
 			case "$PARAM_ENCTYPE" in
@@ -164,7 +164,7 @@ case "$PARAM_MODE" in
 		else
 			printf "ABORTED!\n"
 		fi
-		vdr-eject stopburn
+		vdr-opticaldrive stopburn
 		rm -f "$ABORT_FILE"
 		rm -f "$LOCK_FILE"
 	;;
-- 
cgit v1.2.3