Skip to content

Tidy whitespace and clobber config #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dark-Kernel merged 2 commits into from
Jul 16, 2024
Merged

Tidy whitespace and clobber config #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a75f7
Ensure writing config clobbers old config
belden Jul 15, 2024
667c064
Whitespace cleanup
belden Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 36 additions & 37 deletions bin/ffscreencast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ run_timer() {
while true; do
echo -ne "$(date -u --date @$((SECONDS - start_time)) +%H:%M:%S)\r"
sleep 1
done
done
}

# Trap CTRL+C to stop the timer and exit
trap_ctrlc() {
echo -e "\nRecording stopped."
echo -e "\nRecording stopped."
exit
}

Expand Down Expand Up @@ -181,56 +181,56 @@ write_config() {

{
echo "# ~/.config/ffscreencast/ffscreencastrc"
echo
echo

echo "# Default Directory to save video files"
echo "DIR=\"$HOME/Videos\""
echo
echo "# Default Directory to save video files"
echo "DIR=\"$HOME/Videos\""
echo

echo "# Default video container extension"
echo "# Alternatively: 'mp4' or 'avi'"
echo "OUTPUT_EXT=\"mkv\""
echo
echo "# Default video container extension"
echo "# Alternatively: 'mp4' or 'avi'"
echo "OUTPUT_EXT=\"mkv\""
echo

echo "# Default audio output codec"
echo "# Alternatively: 'pcm_s16le'"
echo "OUTPUT_ACODEC=\"libfaac\""
echo
echo "# Default audio output codec"
echo "# Alternatively: 'pcm_s16le'"
echo "OUTPUT_ACODEC=\"libfaac\""
echo

echo "# Default video output codec"
echo "# Alternatively: 'libx265'"
echo "OUTPUT_VCODEC=\"libx264\""
echo
echo "# Default video output codec"
echo "# Alternatively: 'libx265'"
echo "OUTPUT_VCODEC=\"libx264\""
echo


echo "# Default Screen recording arguments"
echo "S_ARGS=\"\""
echo
echo "# Default Screen recording arguments"
echo "S_ARGS=\"\""
echo

echo "# Default audio recording arguments"
echo "A_ARGS=\"-ac 2\""
echo
echo "# Default audio recording arguments"
echo "A_ARGS=\"-ac 2\""
echo

echo "# Default camera recording arguments"
echo "C_ARGS=\"\""
echo
echo "# Default camera recording arguments"
echo "C_ARGS=\"\""
echo

echo "# Default misc output arguments"
echo "O_ARGS=\"-crf 0 -preset ultrafast\""
echo
echo "# Default misc output arguments"
echo "O_ARGS=\"-crf 0 -preset ultrafast\""
echo

echo "# Default recording behavior"
echo "RECORD_S=\"yes\""
echo "RECORD_A=\"no\""
echo "RECORD_C=\"no\""
echo
echo

echo "# What listed device number has been chosen to record?"
echo "CHOSEN_S_NUM=\"\""
echo "CHOSEN_A_NUM=\"\""
echo "CHOSEN_C_NUM=\"\""
echo
} >> "${conf}"
echo
} > "${conf}"
fi

}
Expand Down Expand Up @@ -306,7 +306,7 @@ print_help() {
echo " Specify additional ffmpeg arguments for the output encoding."
echo " Use: --oargs=\"-crf 0\""
echo " Default: '-crf 0 -preset ultrafast'"
echo
echo
echo "-o Output video file name"
echo
echo
Expand Down Expand Up @@ -896,8 +896,8 @@ while [ $# -gt 0 ]; do
;;
-o*)
shift
NAME="$1"
run_timer &
NAME="$1"
run_timer &
;;


Expand Down Expand Up @@ -1267,4 +1267,3 @@ else
echo "$FFMPEG"
eval "$FFMPEG"
fi