* bin/hollywood, debian/control, debian/copyright, lib/hollywood/apg,

share/hollywood/mi.mp4, share/man/man1/hollywood.1, TODO: - Bug #944275: remove last remnants of old sound/video plugin
dustinkirkland · Nov 7, 2019 · f28b0ff · f28b0ff
1 parent e0a6d78
commit f28b0ff
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 22 deletions.
diff --git a/TODO b/TODO
@@ -3,4 +3,3 @@
   (many ncurses programs will complain if the window is too small)
 * factorize 'trap' commands ?
 * don't depend on $RANDOM (so that we can use $SHELL)
-* play the mi.mp4 file on a loop
diff --git a/bin/hollywood b/bin/hollywood
@@ -34,7 +34,7 @@ spin_up() {
 		# Allow for failed widgets
 		splits=$(echo "$panes" | wc -l)
 		pane=$((RANDOM % $splits))
-		tmux split-window $dir -t ${PKG}.$pane "MPLAYER_OPTS='$MPLAYER_OPTS' nice -n 19 $WIDGET_DIR/$w" >/dev/null 2>&1
+		tmux split-window $dir -t ${PKG}.$pane "nice -n 19 $WIDGET_DIR/$w" >/dev/null 2>&1
 		sleep 0.2
 		split=$((split+1))
 		if [ $split -ge $SPLITS ]; then
@@ -43,16 +43,11 @@ spin_up() {
 	done
 }
 
-MPLAYER_OPTS="-nosound -speed 5"
 WIDGET_DIR="$(dirname $0)/../lib/$PKG"
 SPLITS=$(ls "$WIDGET_DIR" | wc -l)
 DELAY=10
 while [ ! -z "$1" ]; do
 	case "$1" in
-		--sound)
-			MPLAYER_OPTS=""
-			shift
-		;;
 		-d|--delay)
 			DELAY="$2"
 			shift 2

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,10 @@
 hollywood (1.19) unreleased; urgency=medium
 
-  * UNRELEASED
+  * bin/hollywood, debian/control, debian/copyright, lib/hollywood/apg,
+    share/hollywood/mi.mp4, share/man/man1/hollywood.1, TODO:
+    - Bug #944275: remove last remnants of old sound/video plugin
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 12 Jun 2019 19:07:15 -0500
+ -- Dustin Kirkland <kirkland@x250>  Thu, 07 Nov 2019 07:31:20 -0600
 
 hollywood (1.18-0ubuntu1) eoan; urgency=medium
 

diff --git a/debian/control b/debian/control
@@ -27,8 +27,6 @@ Recommends:
  speedometer,
  tmux,
  tree,
-Suggests:
- mplayer
 Description: fill your console with Hollywood melodrama technobabble
  This utility will split your console into a multiple panes of genuine
  technobabble, perfectly suitable for any Hollywood geek melodrama.

diff --git a/debian/copyright b/debian/copyright
@@ -7,14 +7,6 @@ Files: *
 Copyright: 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
 License: Apache-2.0
 
-Files: share/hollywood/mi.mp4
-Copyright: 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
-License: CC0-1.0
- Licensed under the Creative Comons Zero 1.0 Universal (CC0-1.0);
- Public Domain Dedication.
- You may obtain a copy of the License at:
- https://creativecommons.org/publicdomain/zero/1.0/
-
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/lib/hollywood/apg b/lib/hollywood/apg
@@ -18,6 +18,6 @@ command -v apg >/dev/null 2>&1 || exit 1
 
 trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
 while true; do
-	apg -qlt -c /dev/urandom -n 1 | ccze -A -c default=$(printf "red\ngreen\nyellow\nblue\nmagenta\ncyan" | sort -R | head -n1)
+	apg -qlt -c /dev/urandom -n 1 -m 4 | ccze -A -c default=$(printf "red\ngreen\nyellow\nblue\nmagenta\ncyan" | sort -R | head -n1)
 	sleep 0.2
 done
diff --git a/share/hollywood/mi.mp4 b/share/hollywood/mi.mp4
diff --git a/share/man/man1/hollywood.1 b/share/man/man1/hollywood.1
@@ -3,13 +3,12 @@
 hollywood \- fill your console with Hollywood melodrama technobabble
 
 .SH SYNOPSIS
-\fBhollywood\fP [-s|--splits SPLITS] [-d|--delay DELAY] [--sound]
+\fBhollywood\fP [-s|--splits SPLITS] [-d|--delay DELAY]
 
 .SH OPTIONS
 
     -d|--delay DELAY        The delay in seconds before rearranging splits (default=10s)
     -s|--splits SPLITS      The number of splits to divide your screen
-    --sound                 Enable the theme song (default sound=off)
 
 .SH DESCRIPTION