git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@905
fefdeb5f-60dc-0310-8127-
8f9354f1896f
#include <polypcore/core-subscribe.h>
#include <polypcore/xmalloc.h>
#include <polypcore/sink-input.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/xmalloc.h>
#include <polypcore/sink-input.h>
+#include <polypcore/util.h>
#include <polyp/volume.h>
#include "module-volume-restore-symdef.h"
#include <polyp/volume.h>
#include "module-volume-restore-symdef.h"
f = u->table_file ?
fopen(u->table_file, "r") :
pa_open_config_file(NULL, DEFAULT_VOLUME_TABLE_FILE, NULL, &u->table_file, "r");
f = u->table_file ?
fopen(u->table_file, "r") :
pa_open_config_file(NULL, DEFAULT_VOLUME_TABLE_FILE, NULL, &u->table_file, "r");
if (!f) {
if (errno == ENOENT) {
pa_log_info(__FILE__": starting with empty ruleset.");
if (!f) {
if (errno == ENOENT) {
pa_log_info(__FILE__": starting with empty ruleset.");
+ pa_lock_fd(fileno(f), 1);
+
while (!feof(f)) {
struct rule *rule;
pa_cvolume v;
while (!feof(f)) {
struct rule *rule;
pa_cvolume v;
+ if (f) {
+ pa_lock_fd(fileno(f), 0);
+ pa_lock_fd(fileno(f), 1);
+
while ((rule = pa_hashmap_iterate(u->hashmap, &state, NULL))) {
unsigned i;
while ((rule = pa_hashmap_iterate(u->hashmap, &state, NULL))) {
unsigned i;
+ if (f) {
+ pa_lock_fd(fileno(f), 0);