i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* This header couldn't actually be used from C code, since C doesn't support

Browse Source 
overloading functions.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32000 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-07-30 22:10:11 +00:00
parent ce50cdc3ed
commit 377e95304a
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/media/MediaFormats.h
+8 -15
View File
@@ -5,18 +5,17 @@
#ifndef _MEDIA_TYPES_H #ifndef _MEDIA_TYPES_H
#define _MEDIA_TYPES_H #define _MEDIA_TYPES_H
#ifdef __cplusplus
# include <MediaDefs.h>
# include <Messenger.h> #include <MediaDefs.h>
# include <List.h>
# include <Locker.h> #include <Messenger.h>
#endif #include <List.h>
#include <Locker.h>
struct media_codec_info { struct media_codec_info {
char pretty_name[96]; /* eg: "SuperSqueeze Encoder by Foo Inc" */ char pretty_name[96]; /* eg: "SuperSqueeze Encoder by Foo Inc" */
char short_name[32]; /* eg: "supersqueeze" */ char short_name[32]; /* eg: "SuperSqueeze" */
int32 id; /* opaque id passed to int32 id; /* opaque id passed to
BMediaFile::CreateTrack() */ BMediaFile::CreateTrack() */
@@ -177,14 +176,13 @@ typedef struct {
typedef struct _media_format_description { typedef struct _media_format_description {
#ifdef __cplusplus
_media_format_description(); _media_format_description();
~_media_format_description(); ~_media_format_description();
_media_format_description( _media_format_description(
const _media_format_description& other); const _media_format_description& other);
_media_format_description& operator=( _media_format_description& operator=(
const _media_format_description& other); const _media_format_description& other);
#endif
media_format_family family; media_format_family family;
uint32 _reserved_[3]; uint32 _reserved_[3];
union { union {
@@ -202,9 +200,6 @@ typedef struct _media_format_description {
} media_format_description; } media_format_description;
#ifdef __cplusplus
class BMediaFormats { class BMediaFormats {
public: public:
BMediaFormats(); BMediaFormats();
@@ -284,6 +279,4 @@ bool operator==(const GUID& a, const GUID& b);
bool operator<(const GUID& a, const GUID& b); bool operator<(const GUID& a, const GUID& b);
#endif /* __cplusplus */ #endif // _MEDIA_TYPES_H
#endif /* _MEDIA_TYPES_H */