summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2023-01-07 15:58:26 -0300
committerSilvio Rhatto <rhatto@riseup.net>2023-01-07 15:58:26 -0300
commit3a336bc4e60e7d69857a8ccfaad9daf38c542577 (patch)
tree6ed2919ad15d7d80ea117eaae2d489af95029c43
parent0c376beb5f8a499cd558315c358820bfc2f695e9 (diff)
downloadpuppet-mpd-master.tar.gz
puppet-mpd-master.tar.bz2
Fix: updates default.paHEADmaster
-rw-r--r--files/default.pa38
1 files changed, 5 insertions, 33 deletions
diff --git a/files/default.pa b/files/default.pa
index 7a15dde..bded770 100644
--- a/files/default.pa
+++ b/files/default.pa
@@ -13,20 +13,11 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)
-.nofail
-
-### Load something into the sample cache
-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
-
.fail
### Automatically restore the volume of streams and devices
@@ -95,25 +86,22 @@ load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor
-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
+### Load additional modules from GSettings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
-.ifexists module-gconf.so
+.ifexists module-gsettings.so
.nofail
-load-module module-gconf
+load-module module-gsettings
.fail
.endif
+
### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
@@ -145,22 +133,6 @@ load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply
-# X11 modules should not be started from default.pa so that one daemon
-# can be shared by multiple sessions.
-
-### Load X11 bell module
-#load-module module-x11-bell sample=bell-windowing-system
-
-### Register ourselves in the X11 session manager
-#load-module module-x11-xsmp
-
-### Publish connection data in the X11 root window
-#.ifexists module-x11-publish.so
-#.nofail
-#load-module module-x11-publish
-#.fail
-#.endif
-
### Make some devices default
#set-default-sink output
#set-default-source input