| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, Google Inc. All rights reserved. | 2 * Copyright (C) 2010, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 m_destinationNode->uninitialize(); | 194 m_destinationNode->uninitialize(); |
| 195 | 195 |
| 196 if (!isOfflineContext()) { | 196 if (!isOfflineContext()) { |
| 197 ASSERT(s_hardwareContextCount); | 197 ASSERT(s_hardwareContextCount); |
| 198 --s_hardwareContextCount; | 198 --s_hardwareContextCount; |
| 199 } | 199 } |
| 200 | 200 |
| 201 // Get rid of the sources which may still be playing. | 201 // Get rid of the sources which may still be playing. |
| 202 derefUnfinishedSourceNodes(); | 202 derefUnfinishedSourceNodes(); |
| 203 | 203 |
| 204 ASSERT(m_listener); |
| 205 m_listener->waitForHRTFDatabaseLoaderThreadCompletion(); |
| 206 |
| 204 clear(); | 207 clear(); |
| 205 } | 208 } |
| 206 | 209 |
| 207 void AudioContext::stop() | 210 void AudioContext::stop() |
| 208 { | 211 { |
| 209 // Usually ExecutionContext calls stop twice. | 212 // Usually ExecutionContext calls stop twice. |
| 210 if (m_isStopScheduled) | 213 if (m_isStopScheduled) |
| 211 return; | 214 return; |
| 212 m_isStopScheduled = true; | 215 m_isStopScheduled = true; |
| 213 | 216 |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 | 877 |
| 875 for (HashSet<AudioNode*>::iterator k = m_deferredCountModeChange.begin(); k
!= m_deferredCountModeChange.end(); ++k) | 878 for (HashSet<AudioNode*>::iterator k = m_deferredCountModeChange.begin(); k
!= m_deferredCountModeChange.end(); ++k) |
| 876 (*k)->updateChannelCountMode(); | 879 (*k)->updateChannelCountMode(); |
| 877 | 880 |
| 878 m_deferredCountModeChange.clear(); | 881 m_deferredCountModeChange.clear(); |
| 879 } | 882 } |
| 880 | 883 |
| 881 } // namespace blink | 884 } // namespace blink |
| 882 | 885 |
| 883 #endif // ENABLE(WEB_AUDIO) | 886 #endif // ENABLE(WEB_AUDIO) |
| OLD | NEW |