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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 | « media/audio/linux/audio_manager_linux.h ('k') | media/base/pipeline_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Implementation of Pipeline. 5 // Implementation of Pipeline.
6 6
7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_ 7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
8 #define MEDIA_BASE_PIPELINE_IMPL_H_ 8 #define MEDIA_BASE_PIPELINE_IMPL_H_
9 9
10 #include <set> 10 #include <set>
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 void TearDownPipeline(); 273 void TearDownPipeline();
274 274
275 // Compute the current time. Assumes that the lock has been acquired by the 275 // Compute the current time. Assumes that the lock has been acquired by the
276 // caller. 276 // caller.
277 base::TimeDelta GetCurrentTime_Locked() const; 277 base::TimeDelta GetCurrentTime_Locked() const;
278 278
279 // Message loop used to execute pipeline tasks. 279 // Message loop used to execute pipeline tasks.
280 MessageLoop* message_loop_; 280 MessageLoop* message_loop_;
281 281
282 // Lock used to serialize access for the following data members. 282 // Lock used to serialize access for the following data members.
283 mutable Lock lock_; 283 mutable base::Lock lock_;
284 284
285 // Whether or not the pipeline is running. 285 // Whether or not the pipeline is running.
286 bool running_; 286 bool running_;
287 287
288 // Whether or not the pipeline is in transition for a seek operation. 288 // Whether or not the pipeline is in transition for a seek operation.
289 bool seek_pending_; 289 bool seek_pending_;
290 290
291 // Whether or not the pipeline is pending a stop operation. 291 // Whether or not the pipeline is pending a stop operation.
292 bool stop_pending_; 292 bool stop_pending_;
293 293
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 401
402 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime); 402 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);
403 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo); 403 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo);
404 404
405 DISALLOW_COPY_AND_ASSIGN(PipelineImpl); 405 DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
406 }; 406 };
407 407
408 } // namespace media 408 } // namespace media
409 409
410 #endif // MEDIA_BASE_PIPELINE_IMPL_H_ 410 #endif // MEDIA_BASE_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.h ('k') | media/base/pipeline_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698