Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Unified Diff: media/audio/linux/audio_manager_linux.cc

Issue 357004: SetVolume and GetVolume take one volume instead of separate left and right vo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/mac/audio_output_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/audio_manager_linux.cc
===================================================================
--- media/audio/linux/audio_manager_linux.cc (revision 30948)
+++ media/audio/linux/audio_manager_linux.cc (working copy)
@@ -14,6 +14,7 @@
namespace {
+
AudioManagerLinux* g_audio_manager = NULL;
} // namespace
@@ -75,8 +76,10 @@
}
void AudioManagerLinux::ReleaseStream(AlsaPcmOutputStream* stream) {
- AutoLock l(lock_);
- active_streams_.erase(stream);
+ if (stream) {
+ AutoLock l(lock_);
+ active_streams_.erase(stream);
+ }
}
// TODO(ajwong): Collapse this with the windows version.
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/mac/audio_output_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698