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

Side by Side Diff: media/audio/audio_output_proxy.h

Issue 10958020: Don't fallback if we've successfully opened a stream previously. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert double-stop() change. Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
6 #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ 6 #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 27 matching lines...) Expand all
38 virtual void SetVolume(double volume) OVERRIDE; 38 virtual void SetVolume(double volume) OVERRIDE;
39 virtual void GetVolume(double* volume) OVERRIDE; 39 virtual void GetVolume(double* volume) OVERRIDE;
40 virtual void Close() OVERRIDE; 40 virtual void Close() OVERRIDE;
41 41
42 private: 42 private:
43 enum State { 43 enum State {
44 kCreated, 44 kCreated,
45 kOpened, 45 kOpened,
46 kPlaying, 46 kPlaying,
47 kClosed, 47 kClosed,
48 kError, 48 kOpenError,
49 kStartError,
49 }; 50 };
50 51
51 virtual ~AudioOutputProxy(); 52 virtual ~AudioOutputProxy();
52 53
53 scoped_refptr<AudioOutputDispatcher> dispatcher_; 54 scoped_refptr<AudioOutputDispatcher> dispatcher_;
54 State state_; 55 State state_;
55 56
56 // Need to save volume here, so that we can restore it in case the stream 57 // Need to save volume here, so that we can restore it in case the stream
57 // is stopped, and then started again. 58 // is stopped, and then started again.
58 double volume_; 59 double volume_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(AudioOutputProxy); 61 DISALLOW_COPY_AND_ASSIGN(AudioOutputProxy);
61 }; 62 };
62 63
63 } // namespace media 64 } // namespace media
64 65
65 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ 66 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698