Commit d3391880 authored by Booloki's avatar Booloki

Fix mplayer and dvdxchap options

parent a01a9a3f
Pipeline #74 failed with stage
in 30 seconds
......@@ -11,14 +11,14 @@
video_dvd_chapters_extract () {
# Save chapters informations (DVD/ISO_DVD only)
if [[ "${WAZZUF_UI}" == "GUI" ]]; then
debug "( dvdxchap -t \"${TITLE_NUMBER}\" \"${DVDXCHAP_CHAPTERS}\" \"${DVDXCHAP_DEVICE}\" > \"${CHAPTERS_FILE_TXT}\" ) | zenity --progress --pulsate --title \"${ZEN_TITLE}\" --text \"Creating ${CHAPTERS_FILE_TXT} from ${SOURCE}\" --auto-close"
( dvdxchap -t "${TITLE_NUMBER}" "${DVDXCHAP_CHAPTERS}" "${DVDXCHAP_DEVICE}" > "${CHAPTERS_FILE_TXT}" ) \
debug "( dvdxchap -t \"${TITLE_NUMBER}\" ${DVDXCHAP_CHAPTERS} \"${DVDXCHAP_DEVICE}\" > \"${CHAPTERS_FILE_TXT}\" ) | zenity --progress --pulsate --title \"${ZEN_TITLE}\" --text \"Creating ${CHAPTERS_FILE_TXT} from ${SOURCE}\" --auto-close"
( dvdxchap -t "${TITLE_NUMBER}" ${DVDXCHAP_CHAPTERS} "${DVDXCHAP_DEVICE}" > "${CHAPTERS_FILE_TXT}" ) \
| zenity --progress --pulsate --title "${ZEN_TITLE}" --text "Creating ${CHAPTERS_FILE_TXT} from ${SOURCE}" --auto-close --auto-kill
else
echo -ne "\n *************************************\n"
echo " Creating ${CHAPTERS_FILE_TXT} from ${SOURCE}..."
debug "dvdxchap -t \"${TITLE_NUMBER}\" \"${DVDXCHAP_CHAPTERS}\" \"${DVDXCHAP_DEVICE}\" > \"${CHAPTERS_FILE_TXT}\""
dvdxchap -t "${TITLE_NUMBER}" "${DVDXCHAP_CHAPTERS}" "${DVDXCHAP_DEVICE}" > "${CHAPTERS_FILE_TXT}"
debug "dvdxchap -t \"${TITLE_NUMBER}\" ${DVDXCHAP_CHAPTERS} \"${DVDXCHAP_DEVICE}\" > \"${CHAPTERS_FILE_TXT}\""
dvdxchap -t "${TITLE_NUMBER}" ${DVDXCHAP_CHAPTERS} "${DVDXCHAP_DEVICE}" > "${CHAPTERS_FILE_TXT}"
fi
}
......@@ -31,14 +31,14 @@ video_dvd_chapters_extract () {
# return VOB_FILE
video_vob_dump () {
if [[ "${WAZZUF_UI}" == "GUI" ]]; then
debug "( ionice -c \"${IONICENESS}\" nice -n \"${NICENESS}\" mplayer -nolirc -dvd-device \"${MPLAYER_VOB_DUMP_DEVICE}\" -dumpstream dvd://\"${TITLE_NUMBER}\" \"${MPLAYER_VOB_DUMP_CHAPTERS}\" -dumpfile \"${VOB_FILE}\" 2>/dev/null ) | zenity --progress --pulsate --title \"${ZEN_TITLE}\" --text \"Dumping ${VOB_FILE} from ${SOURCE}\" --auto-close"
( echo 10; ionice -c "${IONICENESS}" nice -n "${NICENESS}" mplayer -nolirc -dvd-device "${MPLAYER_VOB_DUMP_DEVICE}" -dumpstream dvd://"${TITLE_NUMBER}" "${MPLAYER_VOB_DUMP_CHAPTERS}" -dumpfile "${VOB_FILE}" 1>/dev/null 2>/dev/null ) \
debug "( ionice -c \"${IONICENESS}\" nice -n \"${NICENESS}\" mplayer -nolirc -dvd-device \"${MPLAYER_VOB_DUMP_DEVICE}\" -dumpstream dvd://\"${TITLE_NUMBER}\" ${MPLAYER_VOB_DUMP_CHAPTERS} -dumpfile \"${VOB_FILE}\" 2>/dev/null ) | zenity --progress --pulsate --title \"${ZEN_TITLE}\" --text \"Dumping ${VOB_FILE} from ${SOURCE}\" --auto-close"
( echo 10; ionice -c "${IONICENESS}" nice -n "${NICENESS}" mplayer -nolirc -dvd-device "${MPLAYER_VOB_DUMP_DEVICE}" -dumpstream dvd://"${TITLE_NUMBER}" ${MPLAYER_VOB_DUMP_CHAPTERS} -dumpfile "${VOB_FILE}" 1>/dev/null 2>/dev/null ) \
| zenity --progress --pulsate --title "${ZEN_TITLE}" --text "Dumping ${VOB_FILE} from ${SOURCE}" --auto-close --auto-kill
else
echo -ne "\n *************************************\n"
echo " Dumping ${VOB_FILE} from ${SOURCE}..."
debug "ionice -c \"${IONICENESS}\" nice -n \"${NICENESS}\" mplayer -nolirc -dvd-device \"${MPLAYER_VOB_DUMP_DEVICE}\" -dumpstream dvd://\"${TITLE_NUMBER}\" \"${MPLAYER_VOB_DUMP_CHAPTERS}\" -dumpfile \"${VOB_FILE}\""
ionice -c "${IONICENESS}" nice -n "${NICENESS}" mplayer -nolirc -dvd-device "${MPLAYER_VOB_DUMP_DEVICE}" -dumpstream dvd://"${TITLE_NUMBER}" "${MPLAYER_VOB_DUMP_CHAPTERS}" -dumpfile "${VOB_FILE}"
debug "ionice -c \"${IONICENESS}\" nice -n \"${NICENESS}\" mplayer -nolirc -dvd-device \"${MPLAYER_VOB_DUMP_DEVICE}\" -dumpstream dvd://\"${TITLE_NUMBER}\" ${MPLAYER_VOB_DUMP_CHAPTERS} -dumpfile \"${VOB_FILE}\""
ionice -c "${IONICENESS}" nice -n "${NICENESS}" mplayer -nolirc -dvd-device "${MPLAYER_VOB_DUMP_DEVICE}" -dumpstream dvd://"${TITLE_NUMBER}" ${MPLAYER_VOB_DUMP_CHAPTERS} -dumpfile "${VOB_FILE}"
fi
}
......
......@@ -14,6 +14,7 @@ GLOBAL_CONF_FILE="/etc/wazzuf-ripper/wazzuf-ripper-global.conf"
source "${GLOBAL_CONF_FILE}"
# check wazzuf files
source "${FUNCTIONS_COMMON}"
# shellcheck source=functions/wazzuf-check
source "${FUNCTIONS_CHECK}"
checkandsource_wazzuf_files
......@@ -1065,7 +1066,7 @@ This is the biggest one. Crop detection for all choosen Titles are in conf file
ac3 )
echo "AUDIO_${j}_SOURCE=\"AC3\"" >> "${CONF_FILE_TMP}"
;;
lpcm )
lpcm* )
echo "AUDIO_${j}_SOURCE=\"PCM\"" >> "${CONF_FILE_TMP}"
;;
dts )
......@@ -1198,7 +1199,7 @@ for ZENITY_OTHER in ${ZENITY_OTHERS}; do
echo "CREATE_SCREENSHOTS=\"1\"" >> "${CONF_FILE_TMP}"
;;
DEBUG )
echo "DEBUG=\"1\"" >> "${CONF_FILE_TMP}"
echo "DEBUG=\"true\"" >> "${CONF_FILE_TMP}"
;;
esac
done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment