Drop qcli process

README.md

@@ -40,7 +40,7 @@ This documentation is up to date as of vrecord version 2020-02-10.
 
 Vrecord is open-source software for capturing a video signal and turning it into a digital file. Its purpose is to make videotape digitization or transfer easier. Vrecord can capture analog and digital signals through a variety of inputs and can create digital video files in a variety of formats and codecs. Vrecord has been designed with the needs of audiovisual archivists in mind. 
 
-Vrecord uses MediaArea’s [ffmpeg-ma](https://github.com/MediaArea/homebrew-mediaarea/blob/master/ffmpeg-ma.rb) to do its dirty work. Other dependencies are: cowsay, [decklinksdk](https://github.com/amiaopensource/homebrew-amiaos/blob/master/decklinksdk.rb), [gtkdialog](https://github.com/amiaopensource/homebrew-amiaos/blob/master/gtkdialog.rb), freetype, sdl, and xmlstarlet. Optional dependencies are: deckcontrol, gnuplot, mediaconch, mkvtoolnix, mpv and qcli.
+Vrecord uses MediaArea’s [ffmpeg-ma](https://github.com/MediaArea/homebrew-mediaarea/blob/master/ffmpeg-ma.rb) to do its dirty work. Other dependencies are: cowsay, [decklinksdk](https://github.com/amiaopensource/homebrew-amiaos/blob/master/decklinksdk.rb), [gtkdialog](https://github.com/amiaopensource/homebrew-amiaos/blob/master/gtkdialog.rb), freetype, sdl, and xmlstarlet. Optional dependencies are: deckcontrol, gnuplot, mediaconch, mkvtoolnix, and mpv.
 
 Currently vrecord supports macOS and Linux, and Blackmagic Design capture cards with the Blackmagic driver installed or
 AVFoundation for DV capture on macOS. Some notes on [needed hardware](Resources/Documentation/hardware.md) are provided.

Release/Release_Mac.sh

@@ -39,10 +39,6 @@ rm -fr "${release_directory}/mediaconch_ROOT"
 rm -f "${release_directory}/MediaConch.dmg"
 rm -f "${release_directory}/mediaconch.pkg"
 
-rm -fr "${release_directory}/qcli_ROOT"
-rm -f "${release_directory}/qcli.dmg"
-rm -f "${release_directory}/qcli.pkg"
-
 rm -fr "${release_directory}/dvrescue_ROOT"
 rm -f "${release_directory}/dvrescue.dmg"
 rm -f "${release_directory}/dvrescue.pkg"
@@ -110,20 +106,6 @@ pushd "${release_directory}/"
     cp -a mediaconch_ROOT/Payload/usr/local/bin/mediaconch vrecord_ROOT/usr/local/lib/vrecord/bin
 popd
 
-#-----------------------------------------------------------------------
-# Get QCTools CLI
-pushd "${release_directory}/"
-    qc_version=$(curl -Ls https://mediaarea.net/download/binary/qcli | grep -Eo 'href="[0-9.]+/"' | head -n1 | grep -Eo '[0-9.]+')
-    curl -L "https://mediaarea.net/download/binary/qcli/${qc_version}/qcli_${qc_version}_mac.dmg" -o qcli.dmg
-
-    hdiutil attach -noverify qcli.dmg
-    cp "/Volumes/qcli/qcli.pkg" .
-    hdiutil detach "/Volumes/qcli"
-
-    pkgutil --expand-full qcli.pkg qcli_ROOT
-    cp -a qcli_ROOT/Payload/usr/local/bin/qcli vrecord_ROOT/usr/local/lib/vrecord/bin
-popd
-
 #-----------------------------------------------------------------------
 # Get dvrescue CLI
 pushd "${release_directory}/"

Resources/vrecord_functions

@@ -60,10 +60,10 @@ _update_config_file(){
         echo "PAL_169_SAR_CHOICE=\"${PAL_169_SAR_CHOICE}\""
         echo "AUDIO_MAPPING_CHOICE=\"${AUDIO_MAPPING_CHOICE}\""
         echo "STANDARD_CHOICE=\"${STANDARD_CHOICE}\""
-        echo "QCTOOLSXML_CHOICE=\"${QCTOOLSXML_CHOICE}\""
         echo "MP4_CHOICE=\"${MP4_CHOICE}\""
         echo "FRAMEMD5_CHOICE=\"${FRAMEMD5_CHOICE}\""
         echo "TIMECODEVTT_CHOICE=\"${TIMECODEVTT_CHOICE}\""
+        echo "QCTOOLSXML_V2_CHOICE=\"${QCTOOLSXML_V2_CHOICE}\""
         echo "EMBED_LOGS_CHOICE=\"${EMBED_LOGS_CHOICE}\""
         echo "PLAYBACKVIEW_CHOICE=\"${PLAYBACKVIEW_CHOICE}\""
         echo "PLAYBACKVIEW_CHOICE_PASS=\"${PLAYBACKVIEW_CHOICE_PASS}\""
@@ -267,7 +267,7 @@ _get_summary(){
             echo "Access MP4: ${MP4_CHOICE}"
             echo "Frame MD5s: ${FRAMEMD5_CHOICE}"
             echo "Timecode VTT: ${TIMECODEVTT_CHOICE}"
-            echo "QCTools XML: ${QCTOOLSXML_CHOICE}"
+            echo "Vrecord QCTools: ${QCTOOLSXML_V2_CHOICE}"
             echo "Playback: ${PLAYBACKVIEW_CHOICE} view (for recording) and ${PLAYBACKVIEW_CHOICE_PASS} view (for passthrough)"
         elif [ "${DEVICE_INPUT_CHOICE}" = "1" ] ; then
             echo "Device Input: DV"