/[svn]/linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceAlsa.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceAlsa.cpp

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

revision 530 by schoenebeck, Thu May 5 17:29:37 2005 UTC revision 531 by schoenebeck, Mon May 9 14:25:09 2005 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6     *   Copyright (C) 2005 Christian Schoenebeck                              *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 322  namespace LinuxSampler { Line 323  namespace LinuxSampler {
323          /* PCM device will return immediately. If SND_PCM_ASYNC is    */          /* PCM device will return immediately. If SND_PCM_ASYNC is    */
324          /* specified, SIGIO will be emitted whenever a period has     */          /* specified, SIGIO will be emitted whenever a period has     */
325          /* been completely processed by the soundcard.                */          /* been completely processed by the soundcard.                */
326          if ((err = snd_pcm_open(&pcm_handle, pcm_name.c_str(), stream, SND_PCM_NONBLOCK)) < 0) {          if ((err = snd_pcm_open(&pcm_handle, pcm_name.c_str(), stream, 0)) < 0) {
327              throw AudioOutputException(String("Error opening PCM device ") + pcm_name + ": " + snd_strerror(err));              throw AudioOutputException(String("Error opening PCM device ") + pcm_name + ": " + snd_strerror(err));
328          }          }
329    
# Line 516  namespace LinuxSampler { Line 517  namespace LinuxSampler {
517      }      }
518    
519      String AudioOutputDeviceAlsa::Version() {      String AudioOutputDeviceAlsa::Version() {
520         String s = "$Revision: 1.19 $";         String s = "$Revision: 1.20 $";
521         return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword         return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
522      }      }
523    

Legend:
Removed from v.530  
changed lines
  Added in v.531

  ViewVC Help
Powered by ViewVC