← Back to branch summary

~elementary-apps/noise/source-view-api

« back to all changes in this revision

Viewing changes to src/Devices/DeviceManager.vala

  • Committer: Corentin Noël
  • Date: 2012-11-10 01:53:46 UTC
  • Revision ID: tintou@mailoo.org-20121110015346-g3e6g1dv1btlbjit
Debuged and re-add some functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Devices/DeviceManager.vala
26
26
        LibraryManager lm;
27
27
        VolumeMonitor vm;
28
28
        
29
 
        Mutex _pref_lock;
30
29
        GLib.List <DevicePreferences> _device_preferences;
31
30
        
32
31
        public signal void device_added(Device d);
41
40
                _device_preferences = new GLib.List <DevicePreferences> ();
42
41
                
43
42
                // pre-load devices and their preferences
44
 
                _pref_lock.lock();
45
 
                _device_preferences = lm.dbm.load_devices();
46
 
                _pref_lock.unlock();
 
43
                
 
44
                lock(_device_preferences) {
 
45
                    _device_preferences = lm.dbm.load_devices();
 
46
                }
47
47
                
48
48
                vm = VolumeMonitor.get();
49
49
                
111
111
        public GLib.List<DevicePreferences> device_preferences() {
112
112
                var rv = new GLib.List<Noise.DevicePreferences>();
113
113
                
114
 
                _pref_lock.lock();
115
 
                foreach(var pref in _device_preferences) {
116
 
                        rv.append(pref);
 
114
                lock(_device_preferences) {
 
115
                    foreach(var pref in _device_preferences) {
 
116
                            rv.append(pref);
 
117
                    }
117
118
                }
118
 
                _pref_lock.unlock();
119
119
                
120
120
                return rv;
121
121
        }
129
129
        }
130
130
        
131
131
        public void add_device_preferences(DevicePreferences dp) {
132
 
                _pref_lock.lock();
133
 
                _device_preferences.append(dp);
134
 
                _pref_lock.unlock();
 
132
                
 
133
                lock(_device_preferences) {
 
134
                    _device_preferences.append(dp);
 
135
                }
135
136
        }
136
137
}