| OLD | NEW |
| 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_TEXT_TRACK_H_ | 5 #ifndef MEDIA_BASE_TEXT_TRACK_H_ |
| 6 #define MEDIA_BASE_TEXT_TRACK_H_ | 6 #define MEDIA_BASE_TEXT_TRACK_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 const std::string& id, | 30 const std::string& id, |
| 31 const std::string& content, | 31 const std::string& content, |
| 32 const std::string& settings) = 0; | 32 const std::string& settings) = 0; |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 typedef base::Callback<scoped_ptr<TextTrack> | 35 typedef base::Callback<scoped_ptr<TextTrack> |
| 36 (TextKind kind, | 36 (TextKind kind, |
| 37 const std::string& label, | 37 const std::string& label, |
| 38 const std::string& language)> AddTextTrackCB; | 38 const std::string& language)> AddTextTrackCB; |
| 39 | 39 |
| 40 class DemuxerStream; |
| 41 |
| 42 typedef base::Callback<void |
| 43 (DemuxerStream* text_stream, |
| 44 scoped_ptr<TextTrack>)> AddTextTrackDoneCB; |
| 45 |
| 46 // TODO(matthewjheaney): temporary callback name until threading issues |
| 47 // have been settled. |
| 48 typedef base::Callback<void |
| 49 (DemuxerStream* stream, |
| 50 TextKind kind, |
| 51 const std::string& label, |
| 52 const std::string& language, |
| 53 const AddTextTrackDoneCB& done_cb)> AddTextTrackCB2; |
| 54 |
| 40 } // namespace media | 55 } // namespace media |
| 41 | 56 |
| 42 #endif // MEDIA_BASE_TEXT_TRACK_H_ | 57 #endif // MEDIA_BASE_TEXT_TRACK_H_ |
| OLD | NEW |