← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to libsound/aos4/sound_handler_ahi.cpp

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
libsound/aos4/sound_handler_ahi.cpp
1
1
// sound_handler_ahi.cpp: Sound handling using standard AHI
2
2
//
3
 
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
4
 
//   2011 Free Software Foundation, Inc
 
3
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 
4
//   Free Software Foundation, Inc
5
5
//
6
6
// This program is free software; you can redistribute it and/or modify
7
7
// it under the terms of the GNU General Public License as published by
122
122
{
123
123
    if ( _audioOpened ) return; // nothing to do
124
124
 
125
 
        log_debug(_("AOS4: Spawn Audio Process.."));
 
125
        log_debug(_("AOS4: Spawn Audio Process."));
126
126
        
127
127
        _DMreplyport = (struct MsgPort*) IExec->AllocSysObjectTags(ASOT_PORT, TAG_DONE);
128
128
        _dmsg            = (struct DeathMessage*) IExec->AllocSysObjectTags(ASOT_MESSAGE,
159
159
                audioTaskID = (int)AudioPump;
160
160
                
161
161
                _audioOpened = true;
162
 
                log_debug(_("AOS4: Audio Process spawned.."));
 
162
                log_debug(_("AOS4: Audio Process spawned."));
163
163
        }
164
164
        else
165
165
        {
604
604
        AHIios[0]=AHIio;
605
605
        AHIios[1]=(AHIRequest*)AHIiocopy;
606
606
 
607
 
        log_debug(_("AOS4: audioTask:Initialize timer.."));
 
607
        log_debug(_("AOS4: audioTask:Initialize timer."));
608
608
        TimerInit();
609
609
 
610
 
        log_debug(_("AOS4: audioTask:Starting Timer.."));
 
610
        log_debug(_("AOS4: audioTask:Starting Timer."));
611
611
        TimerReset(RESET_TIME);
612
612
    while (true)
613
613
    {
618
618
            if (sigGot & SIGBREAKF_CTRL_C)
619
619
            {
620
620
                        _closing = true;
621
 
                        log_debug(_("AOS4: Closing Audio Thread.."));
 
621
                        log_debug(_("AOS4: Closing Audio Thread."));
622
622
                        break;
623
623
                }
624
624
                if (sigGot & _timerSig)
638
638
            }
639
639
        }
640
640
 
641
 
        log_debug(_("AOS4: Cleaning Audio Stuff.."));
 
641
        log_debug(_("AOS4: Cleaning Audio Stuff."));
642
642
 
643
643
        if (AHIios[0])
644
644
        {
672
672
        if (PlayBuffer[0]) IExec->FreeMem(PlayBuffer[0],BUFSIZE); PlayBuffer[0] = 0;
673
673
        if (PlayBuffer[1]) IExec->FreeMem(PlayBuffer[1],BUFSIZE); PlayBuffer[1] = 0;
674
674
 
675
 
        log_debug(_("AOS4: Exit Audio Thread.."));
 
675
        log_debug(_("AOS4: Exit Audio Thread."));
676
676
 
677
 
        log_debug(_("AOS4: audioTask:Close timer.."));
 
677
        log_debug(_("AOS4: audioTask:Close timer."));
678
678
        TimerExit();
679
679
    return(RETURN_OK);
680
680
}