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

Side by Side Diff: media/base/pipeline.h

Issue 10823222: Inline media::Pipeline::ResetState() into initializer list. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: forgot .h Created 8 years, 4 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
« no previous file with comments | « no previous file | media/base/pipeline.cc » ('j') | media/base/pipeline.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BASE_PIPELINE_H_ 5 #ifndef MEDIA_BASE_PIPELINE_H_
6 #define MEDIA_BASE_PIPELINE_H_ 6 #define MEDIA_BASE_PIPELINE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 kSeeking, 245 kSeeking,
246 kFlushing, 246 kFlushing,
247 kStarting, 247 kStarting,
248 kStarted, 248 kStarted,
249 kEnded, 249 kEnded,
250 kStopping, 250 kStopping,
251 kStopped, 251 kStopped,
252 kError, 252 kError,
253 }; 253 };
254 254
255 // Reset the state of the pipeline object to the initial state. This method
256 // is used by the constructor, and the Stop() method.
257 void ResetState();
258
259 // Updates |state_|. All state transitions should use this call. 255 // Updates |state_|. All state transitions should use this call.
260 void SetState(State next_state); 256 void SetState(State next_state);
261 257
262 // Simple method used to make sure the pipeline is running normally. 258 // Simple method used to make sure the pipeline is running normally.
263 bool IsPipelineOk(); 259 bool IsPipelineOk();
264 260
265 // Helper method to tell whether we are stopped or in error. 261 // Helper method to tell whether we are stopped or in error.
266 bool IsPipelineStopped(); 262 bool IsPipelineStopped();
267 263
268 // Helper method to tell whether we are in transition to stop state. 264 // Helper method to tell whether we are in transition to stop state.
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 base::Time creation_time_; 559 base::Time creation_time_;
564 560
565 scoped_ptr<SerialRunner> pending_callbacks_; 561 scoped_ptr<SerialRunner> pending_callbacks_;
566 562
567 DISALLOW_COPY_AND_ASSIGN(Pipeline); 563 DISALLOW_COPY_AND_ASSIGN(Pipeline);
568 }; 564 };
569 565
570 } // namespace media 566 } // namespace media
571 567
572 #endif // MEDIA_BASE_PIPELINE_H_ 568 #endif // MEDIA_BASE_PIPELINE_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/pipeline.cc » ('j') | media/base/pipeline.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698