summaryrefslogtreecommitdiff
path: root/community-staging/xmms2/xmms2d.conf
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-06-10 11:35:18 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-06-10 11:35:18 +0200
commit51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch)
tree3419b254ec8c04b09a938d993fdb768eae03c005 /community-staging/xmms2/xmms2d.conf
parent11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff)
parent7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/kdemultimedia/PKGBUILD extra/kdenetwork/PKGBUILD extra/samba/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/wine/PKGBUILD staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'community-staging/xmms2/xmms2d.conf')
-rw-r--r--community-staging/xmms2/xmms2d.conf31
1 files changed, 0 insertions, 31 deletions
diff --git a/community-staging/xmms2/xmms2d.conf b/community-staging/xmms2/xmms2d.conf
deleted file mode 100644
index c8304fe1d..000000000
--- a/community-staging/xmms2/xmms2d.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# xmms2-launcher cmdline parameters
-#
-XMMS2_PARAMETERS=""
-
-#
-# xmms2 user
-# You may want to add user to run xmms or use your username
-#
-XMMS2_USER="xmms2user"
-
-#
-# If you set XMMS2_USER to a different user than the one who will be controlling
-# xmms2d using xmms2 clients, make sure that the clients are aware of the path to
-# xmms2d's IPC socket, or they might not be able to connect. On failure to connect
-# some clients will try to run xmms2d themselves. These xmms2d instances will of
-# course run as the user running the client, and not as the one configured below.
-#
-# If an IPC path is specified on the command line to xmms2d (using
-# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667"
-# for instance) that will be used. If not, xmms2d will use the path from its
-# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this
-# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username
-# is of the user starting xmms2d.
-#
-# Clients typically try to get the ipc path from the XMMS_PATH environment variable,
-# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to
-# ~/.profile). If this fails they can check their configuration file (if they have
-# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user
-# starting the client. Upon failing to connect some will try to start xmms2d themselves.
-#