| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_ | 11 #ifndef WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ |
| 12 #define WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_ | 12 #define WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ |
| 13 |
| 14 #pragma message("WARNING: media_file/interface is DEPRECATED; use media_file/inc
lude") |
| 13 | 15 |
| 14 #include "webrtc/common_types.h" | 16 #include "webrtc/common_types.h" |
| 15 #include "webrtc/modules/interface/module.h" | 17 #include "webrtc/modules/include/module.h" |
| 16 #include "webrtc/modules/interface/module_common_types.h" | 18 #include "webrtc/modules/include/module_common_types.h" |
| 17 #include "webrtc/modules/media_file/interface/media_file_defines.h" | 19 #include "webrtc/modules/media_file/include/media_file_defines.h" |
| 18 #include "webrtc/typedefs.h" | 20 #include "webrtc/typedefs.h" |
| 19 | 21 |
| 20 namespace webrtc { | 22 namespace webrtc { |
| 21 class MediaFile : public Module | 23 class MediaFile : public Module |
| 22 { | 24 { |
| 23 public: | 25 public: |
| 24 // Factory method. Constructor disabled. id is the identifier for the | 26 // Factory method. Constructor disabled. id is the identifier for the |
| 25 // MediaFile instance. | 27 // MediaFile instance. |
| 26 static MediaFile* CreateMediaFile(const int32_t id); | 28 static MediaFile* CreateMediaFile(const int32_t id); |
| 27 static void DestroyMediaFile(MediaFile* module); | 29 static void DestroyMediaFile(MediaFile* module); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 | 172 |
| 171 // Update codecInst according to the current audio codec being used for | 173 // Update codecInst according to the current audio codec being used for |
| 172 // reading or writing. | 174 // reading or writing. |
| 173 virtual int32_t codec_info(CodecInst& codecInst) const = 0; | 175 virtual int32_t codec_info(CodecInst& codecInst) const = 0; |
| 174 | 176 |
| 175 protected: | 177 protected: |
| 176 MediaFile() {} | 178 MediaFile() {} |
| 177 virtual ~MediaFile() {} | 179 virtual ~MediaFile() {} |
| 178 }; | 180 }; |
| 179 } // namespace webrtc | 181 } // namespace webrtc |
| 180 #endif // WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_ | 182 #endif // WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ |
| OLD | NEW |