← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to apps/app_mixmonitor.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-10-15 22:24:34 UTC
  • mfrom: (1.2.8 upstream) (8.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101015222434-iy328q8in3lajzlv
Tags: 1:1.6.2.9-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + Build-depend on hardening-wrapper
    + Change Maintainer
    + Removed Uploaders field.
    + Removed Debian Vcs-Svn entry and replaced with ubuntu-voip Vcs-Bzr,
      to reflect divergence in packages.
  - debian/rules: Make use of hardening-wrapper
  - debian/asterisk.init: chown /dev/dahdi
  - debian/backports/hardy: add file
  - debian/backports/asterisk.init.hardy: add file
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/app_mixmonitor.c
35
35
 
36
36
#include "asterisk.h"
37
37
 
38
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 237657 $")
 
38
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 257740 $")
39
39
 
40
40
#include "asterisk/paths.h"     /* use ast_config_AST_MONITOR_DIR */
41
41
#include "asterisk/file.h"
294
294
        while (mixmonitor->audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING && !mixmonitor->mixmonitor_ds->fs_quit) {
295
295
                struct ast_frame *fr = NULL;
296
296
 
297
 
                ast_audiohook_trigger_wait(&mixmonitor->audiohook);
298
 
 
299
 
                if (mixmonitor->audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING)
300
 
                        break;
301
 
 
302
 
                if (!(fr = ast_audiohook_read_frame(&mixmonitor->audiohook, SAMPLES_PER_FRAME, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR)))
 
297
                if (!(fr = ast_audiohook_read_frame(&mixmonitor->audiohook, SAMPLES_PER_FRAME, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR))) {
 
298
                        ast_audiohook_trigger_wait(&mixmonitor->audiohook);
 
299
 
 
300
                        if (mixmonitor->audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING) {
 
301
                                break;
 
302
                        }
303
303
                        continue;
 
304
                }
304
305
 
305
306
                /* audiohook lock is not required for the next block.
306
307
                 * Unlock it, but remember to lock it before looping or exiting */