Skip to content
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.

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

Misc enhancements for 3.1.8 #717

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions misc/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ case "$1" in
exit 1
fi

BC_GENERAL_VERSION=`echo "SELECT value from GlobalSettings WHERE parameter = 'G_DVR_NAME'" \
| mysql -h "$host" -D"$dbname" -u"$user" -p"$password" | tail -n 1 | tr "Bluecherry DVR v" " "`
BC_GENERAL_VERSION=$(echo "SELECT value from GlobalSettings WHERE parameter = 'G_DVR_NAME'" \
| mysql -h "$host" -D"$dbname" -u"$user" -p"$password" | tail -n 1 | sed -e "s/Bluecherry DVR v//")

if [ $BC_GENERAL_VERSION == 2 ];
then
Expand Down
10 changes: 5 additions & 5 deletions server/recorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ void recorder::run()
bc_log(Error, "Failed while feeding snapshot saver with more frames");
stop_snapshot();
} else if (ret > 0) {
bc_log(Info, "Still need to feed more frames to finish snapshot");
bc_log(Debug, "Still need to feed more frames to finish snapshot");
} else {
bc_log(Info, "Finalized snapshot");
bc_log(Debug, "Finalized snapshot");
stop_snapshot();
snapshots_done++;
event_trigger_notifications(current_event);
Expand All @@ -123,7 +123,7 @@ void recorder::run()
+ (snapshotting_delay_since_motion_start_ms/1000))) {

stop_snapshot();
bc_log(Info, "Making a snapshot");
bc_log(Debug, "Making a snapshot");

// Push frames to decoder until picture is taken
// In some cases one AVPacket marked as keyframe is not enough, and next
Expand All @@ -141,9 +141,9 @@ void recorder::run()
bc_log(Error, "Failed to make snapshot");
stop_snapshot();
} else if (ret > 0) {
bc_log(Info, "Need to feed more frames to finish snapshot");
bc_log(Debug, "Need to feed more frames to finish snapshot");
} else {
bc_log(Info, "Saved snapshot from single keyframe");
bc_log(Debug, "Saved snapshot from single keyframe");
snapshots_done++;
stop_snapshot();
event_trigger_notifications(current_event);
Expand Down
Loading