From c047bab910d340ae0036ea6881f8041fa8b75200 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 27 Jan 2020 15:42:59 +0100
Subject: [PATCH] rename pipewire tools

Use the pw- prefix for all pipewire tools. This makes the
commands shorter but also avoids conflicts with password
and patchwork tools (pwcli is taken, pwconv is maybe we someday
can make).

pipewire-monitor -> pw-mon
pipewire-cli -> pw-cli
pipewire-dot -> pw-dot
pwcat -> pw-cat
---
 Makefile.in                                |  4 ++--
 meson.build                                |  2 +-
 meson_options.txt                          |  4 ++--
 src/tools/meson.build                      | 24 +++++++++++-----------
 src/tools/{pwcat.c => pw-cat.c}            |  2 +-
 src/tools/{pipewire-cli.c => pw-cli.c}     |  0
 src/tools/{pipewire-dot.c => pw-dot.c}     |  0
 src/tools/{pipewire-monitor.c => pw-mon.c} |  0
 8 files changed, 18 insertions(+), 18 deletions(-)
 rename src/tools/{pwcat.c => pw-cat.c} (99%)
 rename src/tools/{pipewire-cli.c => pw-cli.c} (100%)
 rename src/tools/{pipewire-dot.c => pw-dot.c} (100%)
 rename src/tools/{pipewire-monitor.c => pw-mon.c} (100%)

diff --git a/Makefile.in b/Makefile.in
index 29e4355f4..d63806e23 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,12 +32,12 @@ benchmark: all
 monitor: all
 	SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \
 	PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \
-	@BUILD_ROOT@/src/tools/pipewire-monitor
+	@BUILD_ROOT@/src/tools/pw-mon
 
 cli: all
 	SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \
 	PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \
-	@BUILD_ROOT@/src/tools/pipewire-cli
+	@BUILD_ROOT@/src/tools/pw-cli
 
 shell: all
 	ninja -C @BUILD_ROOT@ uninstalled
diff --git a/meson.build b/meson.build
index 92673b821..b115f43d1 100644
--- a/meson.build
+++ b/meson.build
@@ -192,7 +192,7 @@ dl_lib = cc.find_library('dl', required : false)
 pthread_lib = dependency('threads')
 dbus_dep = dependency('dbus-1')
 sdl_dep = dependency('sdl2', required : false)
-if get_option('pwcat')
+if get_option('pw-cat')
   sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 4e7274949..7b7c9f4ce 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -98,7 +98,7 @@ option('vulkan',
        description: 'Enable vulkan spa plugin integration',
        type: 'boolean',
        value: true)
-option('pwcat',
-       description: 'Build pwcat/pwplay/pwrecord',
+option('pw-cat',
+       description: 'Build pw-cat/pw-play/pw-record',
        type: 'boolean',
        value: true)
diff --git a/src/tools/meson.build b/src/tools/meson.build
index d2758e5be..2df7b602a 100644
--- a/src/tools/meson.build
+++ b/src/tools/meson.build
@@ -1,34 +1,34 @@
-executable('pipewire-monitor',
-	'pipewire-monitor.c',
+executable('pw-mon',
+	'pw-mon.c',
 	c_args : [ '-D_GNU_SOURCE' ],
 	install: true,
 	dependencies : [pipewire_dep],
 )
-executable('pipewire-cli',
-	'pipewire-cli.c',
+executable('pw-cli',
+	'pw-cli.c',
 	c_args : [ '-D_GNU_SOURCE' ],
 	install: true,
 	dependencies : [pipewire_dep],
 )
-executable('pipewire-dot',
-	'pipewire-dot.c',
+executable('pw-dot',
+	'pw-dot.c',
 	c_args : [ '-D_GNU_SOURCE' ],
 	install: true,
 	dependencies : [pipewire_dep],
 )
 
-if get_option('pwcat') and sndfile_dep.found()
+if get_option('pw-cat') and sndfile_dep.found()
 
   pwcat_sources = [
-    'pwcat.c',
+    'pw-cat.c',
   ]
 
   pwcat_aliases = [
-    'pwplay',
-    'pwrecord',
+    'pw-play',
+    'pw-record',
   ]
 
-  executable('pwcat',
+  executable('pw-cat',
     pwcat_sources,
     c_args : [ '-D_GNU_SOURCE' ],
     install: true,
@@ -37,7 +37,7 @@ if get_option('pwcat') and sndfile_dep.found()
 
   foreach alias : pwcat_aliases
     dst = join_paths(pipewire_bindir, alias)
-    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pwcat', dst)
+    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pw-cat', dst)
     meson.add_install_script('sh', '-c', cmd)
   endforeach
 
diff --git a/src/tools/pwcat.c b/src/tools/pw-cat.c
similarity index 99%
rename from src/tools/pwcat.c
rename to src/tools/pw-cat.c
index bd399910c..1e90f9e11 100644
--- a/src/tools/pwcat.c
+++ b/src/tools/pw-cat.c
@@ -1,4 +1,4 @@
-/* PipeWire - pwcat
+/* PipeWire - pw-cat
  *
  * Copyright © 2020 Konsulko Group
 
diff --git a/src/tools/pipewire-cli.c b/src/tools/pw-cli.c
similarity index 100%
rename from src/tools/pipewire-cli.c
rename to src/tools/pw-cli.c
diff --git a/src/tools/pipewire-dot.c b/src/tools/pw-dot.c
similarity index 100%
rename from src/tools/pipewire-dot.c
rename to src/tools/pw-dot.c
diff --git a/src/tools/pipewire-monitor.c b/src/tools/pw-mon.c
similarity index 100%
rename from src/tools/pipewire-monitor.c
rename to src/tools/pw-mon.c