/[openvortex]/alsa/alsa-kernel/synth/emux/soundfont.c
ViewVC logotype

Diff of /alsa/alsa-kernel/synth/emux/soundfont.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.1.1 by vizard, Tue Apr 15 21:35:50 2003 UTC revision 1.2 by vizard, Mon Aug 11 00:06:40 2003 UTC
# Line 66  static void snd_sf_clear(snd_sf_list_t * Line 66  static void snd_sf_clear(snd_sf_list_t *
66  static int  static int
67  lock_preset(snd_sf_list_t *sflist, int nonblock)  lock_preset(snd_sf_list_t *sflist, int nonblock)
68  {  {
69          unsigned long flags;          if (nonblock) {
70          spin_lock_irqsave(&sflist->lock, flags);                  if (down_trylock(&sflist->presets_mutex))
71          if (sflist->sf_locked && nonblock) {                          return -EBUSY;
72                  spin_unlock_irqrestore(&sflist->lock, flags);          } else
73                  return -EBUSY;                  down(&sflist->presets_mutex);
         }  
         spin_unlock_irqrestore(&sflist->lock, flags);  
         down(&sflist->presets_mutex);  
         sflist->sf_locked = 1;  
74          return 0;          return 0;
75  }  }
76    
# Line 86  static void Line 82  static void
82  unlock_preset(snd_sf_list_t *sflist)  unlock_preset(snd_sf_list_t *sflist)
83  {  {
84          up(&sflist->presets_mutex);          up(&sflist->presets_mutex);
         sflist->sf_locked = 0;  
85  }  }
86    
87    
# Line 1356  snd_sf_new(snd_sf_callback_t *callback, Line 1351  snd_sf_new(snd_sf_callback_t *callback,
1351    
1352          init_MUTEX(&sflist->presets_mutex);          init_MUTEX(&sflist->presets_mutex);
1353          spin_lock_init(&sflist->lock);          spin_lock_init(&sflist->lock);
         sflist->sf_locked = 0;  
1354          sflist->memhdr = hdr;          sflist->memhdr = hdr;
1355    
1356          if (callback)          if (callback)
# Line 1403  snd_soundfont_remove_samples(snd_sf_list Line 1397  snd_soundfont_remove_samples(snd_sf_list
1397    
1398  /*  /*
1399   * Remove unlocked samples.   * Remove unlocked samples.
1400   * The soundcard should be silet before calling this function.   * The soundcard should be silent before calling this function.
1401   */   */
1402  int  int
1403  snd_soundfont_remove_unlocked(snd_sf_list_t *sflist)  snd_soundfont_remove_unlocked(snd_sf_list_t *sflist)

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26