summaryrefslogtreecommitdiffstats
path: root/src/modules/module-match.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-05-14 00:41:18 +0000
committerLennart Poettering <lennart@poettering.net>2006-05-14 00:41:18 +0000
commitbe05b18c6fb6f0e2e2b74ffdf251692a45eaa045 (patch)
tree7974db8d050c3fd6e19dcd3aaa7dde5875f91168 /src/modules/module-match.c
parente46f8f8eb3fd586f8728e43292509434e0e8b089 (diff)
* add new parameter to pa_open_config_file() to specify open mode
* modify pa_sink_input_new() to take initial volume settings as argument * call pa_sink_input_set_volume() when changing stream volume in protocol-esound.c to make sure that subscribe events are issued properly git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@858 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-match.c')
-rw-r--r--src/modules/module-match.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 59817517..f6316b93 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -43,7 +43,7 @@
#include "module-match-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
-PA_MODULE_DESCRIPTION("Sink input matching module")
+PA_MODULE_DESCRIPTION("Playback stream expression matching module")
PA_MODULE_USAGE("table=<filename>")
PA_MODULE_VERSION(PACKAGE_VERSION)
@@ -81,7 +81,7 @@ static int load_rules(struct userdata *u, const char *filename) {
f = filename ?
fopen(fn = pa_xstrdup(filename), "r") :
- pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn);
+ pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn, "r");
if (!f) {
pa_log(__FILE__": failed to open file '%s': %s", fn, strerror(errno));