Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Kinabalu Coders
pi-cameraserver
Commits
c87d527c
Commit
c87d527c
authored
6 years ago
by
null pointer
Browse files
Options
Download
Email Patches
Plain Diff
improve readability of frame captions
parent
de2fd804
master
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pull-store-push-ticker.sh
+8
-1
pull-store-push-ticker.sh
pull-store-push.sh
+5
-1
pull-store-push.sh
with
13 additions
and
2 deletions
+13
-2
pull-store-push-ticker.sh
+
8
-
1
View file @
c87d527c
...
...
@@ -43,8 +43,15 @@ do
else
downtime
=
0
TIMESTAMP
=
$(
date
+
"%Y-%m-%d %H:%M:%S"
)
TICKER_HAZE
=
`
cat
/ram/ticker-haze.sabah.io.txt
`
convert
"
$TARGET
"
-gravity
SouthWest
-fill
white
-stroke
black
-font
"FreeSans-Regular"
-pointsize
16
-annotate
+10+10
"
$(
date
+
"%Y-%m-%d %H:%M:%S"
)
"
-gravity
SouthEast
-annotate
+10+10
"
$TICKER_HAZE
"
-strip
"
$TARGET
"
convert
"
$TARGET
"
-gravity
SouthWest
-fill
white
-font
"FreeSans-Regular"
-pointsize
16
\
-stroke
black
-annotate
+10+10
"
$TIMESTAMP
"
\
-stroke
none
-annotate
+10+10
"
$TIMESTAMP
"
\
-gravity
SouthEast
\
-stroke
black
-annotate
+10+10
"
$TICKER_HAZE
"
\
-stroke
none
-annotate
+10+10
"
$TICKER_HAZE
"
\
-strip
"
$TARGET
"
if
[[
!
-z
"
$SNAPSHOT
"
]]
;
then
/usr/bin/php
-f
"
$DIR
/videos/store-snapshot.php"
--
-f
"
$TARGET
"
-n
"snapshots.
$SNAPSHOT
.{date:Ymd}"
-b
"
$SNAPSHOT
"
-r
"
$FRAMERATE
"
...
...
This diff is collapsed.
Click to expand it.
pull-store-push.sh
+
5
-
1
View file @
c87d527c
...
...
@@ -43,7 +43,11 @@ do
else
downtime
=
0
convert
"
$TARGET
"
-gravity
SouthWest
-fill
white
-stroke
black
-font
"FreeSans-Regular"
-pointsize
16
-annotate
+10+10
"
$(
date
+
"%Y-%m-%d %H:%M:%S"
)
"
-strip
"
$TARGET
"
TIMESTAMP
=
$(
date
+
"%Y-%m-%d %H:%M:%S"
)
convert
"
$TARGET
"
-gravity
SouthWest
-fill
white
-font
"FreeSans-Regular"
-pointsize
16
\
-stroke
black
-annotate
+10+10
"
$TIMESTAMP
"
\
-stroke
none
-annotate
+10+10
"
$TIMESTAMP
"
\
-strip
"
$TARGET
"
if
[[
!
-z
"
$SNAPSHOT
"
]]
;
then
/usr/bin/php
-f
"
$DIR
/videos/store-snapshot.php"
--
-f
"
$TARGET
"
-n
"snapshots.
$SNAPSHOT
.{date:Ymd}"
-b
"
$SNAPSHOT
"
-r
"
$FRAMERATE
"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets