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

Side by Side Diff: media/audio/alsa/alsa_output.cc

Issue 1837483003: Move base::FreeDeleter into its own header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // THREAD SAFETY 5 // THREAD SAFETY
6 // 6 //
7 // AlsaPcmOutputStream object is *not* thread-safe and should only be used 7 // AlsaPcmOutputStream object is *not* thread-safe and should only be used
8 // from the audio thread. We DCHECK on this assumption whenever we can. 8 // from the audio thread. We DCHECK on this assumption whenever we can.
9 // 9 //
10 // SEMANTICS OF Close() 10 // SEMANTICS OF Close()
(...skipping 22 matching lines...) Expand all
33 // data. 33 // data.
34 34
35 #include "media/audio/alsa/alsa_output.h" 35 #include "media/audio/alsa/alsa_output.h"
36 36
37 #include <stddef.h> 37 #include <stddef.h>
38 38
39 #include <algorithm> 39 #include <algorithm>
40 40
41 #include "base/bind.h" 41 #include "base/bind.h"
42 #include "base/logging.h" 42 #include "base/logging.h"
43 #include "base/memory/free_deleter.h"
43 #include "base/stl_util.h" 44 #include "base/stl_util.h"
44 #include "base/trace_event/trace_event.h" 45 #include "base/trace_event/trace_event.h"
45 #include "media/audio/alsa/alsa_util.h" 46 #include "media/audio/alsa/alsa_util.h"
46 #include "media/audio/alsa/alsa_wrapper.h" 47 #include "media/audio/alsa/alsa_wrapper.h"
47 #include "media/audio/alsa/audio_manager_alsa.h" 48 #include "media/audio/alsa/audio_manager_alsa.h"
48 #include "media/base/channel_mixer.h" 49 #include "media/base/channel_mixer.h"
49 #include "media/base/data_buffer.h" 50 #include "media/base/data_buffer.h"
50 #include "media/base/seekable_buffer.h" 51 #include "media/base/seekable_buffer.h"
51 52
52 namespace media { 53 namespace media {
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 } 795 }
795 796
796 // Changes the AudioSourceCallback to proxy calls to. Pass in NULL to 797 // Changes the AudioSourceCallback to proxy calls to. Pass in NULL to
797 // release ownership of the currently registered callback. 798 // release ownership of the currently registered callback.
798 void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) { 799 void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) {
799 DCHECK(IsOnAudioThread()); 800 DCHECK(IsOnAudioThread());
800 source_callback_ = callback; 801 source_callback_ = callback;
801 } 802 }
802 803
803 } // namespace media 804 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698