Skip to content

Commit

Permalink
fix unsafe symbols names #10
Browse files Browse the repository at this point in the history
  • Loading branch information
agfline committed Nov 16, 2023
1 parent 89ef970 commit 3e4c2cd
Show file tree
Hide file tree
Showing 23 changed files with 524 additions and 524 deletions.
4 changes: 2 additions & 2 deletions include/libaaf/AAFIAudioFiles.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@

#include <libaaf/AAFIface.h>

char * locate_external_essence_file( AAF_Iface *aafi, const wchar_t *original_file_path, const char *search_location );
char * aafi_locate_external_essence_file( AAF_Iface *aafi, const wchar_t *original_file_path, const char *search_location );

int aafi_extract_audio_essence( AAF_Iface *aafi, aafiAudioEssence *audioEssence, const char *outfilepath, const wchar_t *forcedFileName );

int parse_audio_summary( AAF_Iface *aafi, aafiAudioEssence *audioEssence );
int aafi_parse_audio_summary( AAF_Iface *aafi, aafiAudioEssence *audioEssence );


#endif // !__AAFIAudioFiles_h__
18 changes: 9 additions & 9 deletions include/libaaf/AAFIParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,21 @@ typedef struct trace_dump {


#define DUMP_OBJ( aafi, Obj, __td ) \
_DUMP_OBJ( aafi, Obj, __td, TD_OK, __LINE__, "" );
aafi_dump_obj( aafi, Obj, __td, TD_OK, __LINE__, "" );

#define DUMP_OBJ_INFO( aafi, Obj, __td, ... ) \
_DUMP_OBJ( aafi, Obj, __td, TD_OK, __LINE__, __VA_ARGS__ );
aafi_dump_obj( aafi, Obj, __td, TD_OK, __LINE__, __VA_ARGS__ );

#define DUMP_OBJ_WARNING( aafi, Obj, __td, ... ) \
_DUMP_OBJ( aafi, Obj, __td, TD_WARNING, __LINE__, __VA_ARGS__ );
aafi_dump_obj( aafi, Obj, __td, TD_WARNING, __LINE__, __VA_ARGS__ );

#define DUMP_OBJ_ERROR( aafi, Obj, __td, ... ) \
(__td)->eob = 1; \
_DUMP_OBJ( aafi, Obj, __td, TD_ERROR, __LINE__, __VA_ARGS__ );
aafi_dump_obj( aafi, Obj, __td, TD_ERROR, __LINE__, __VA_ARGS__ );

#define DUMP_OBJ_NO_SUPPORT( aafi, Obj, __td ) \
(__td)->eob = 1; \
_DUMP_OBJ_NO_SUPPORT( aafi, Obj, __td, __LINE__ );
aafi_dump_obj_no_support( aafi, Obj, __td, __LINE__ );



Expand All @@ -99,14 +99,14 @@ int aafi_retrieveData( AAF_Iface *aafi );
* so they are accessible to vendor-specific files (Resolve.c, ProTools.c, etc.)
*/

void _DUMP_OBJ( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int state, int line, const char *fmt, ... );
void aafi_dump_obj( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int state, int line, const char *fmt, ... );

void _DUMP_OBJ_NO_SUPPORT( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int line );
void aafi_dump_obj_no_support( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int line );

void trace_obj( AAF_Iface *aafi, aafObject *Obj, const char *color );
void aafi_trace_obj( AAF_Iface *aafi, aafObject *Obj, const char *color );


int parse_Segment( AAF_Iface *aafi, aafObject *Segment, td *__ptd );
int aafi_parse_Segment( AAF_Iface *aafi, aafObject *Segment, td *__ptd );


#endif // !__AAFIParser_h__
6 changes: 3 additions & 3 deletions include/libaaf/AAFIface.h
Original file line number Diff line number Diff line change
Expand Up @@ -934,11 +934,11 @@ void aafi_release( AAF_Iface **aafi );
int aafi_load_file( AAF_Iface *aafi, const char * file );


aafiTransition * get_fadein( aafiTimelineItem *audioItem );
aafiTransition * aafi_get_fadein( aafiTimelineItem *audioItem );

aafiTransition * get_fadeout( aafiTimelineItem *audioItem );
aafiTransition * aafi_get_fadeout( aafiTimelineItem *audioItem );

aafiTransition * get_xfade( aafiTimelineItem *audioItem );
aafiTransition * aafi_get_xfade( aafiTimelineItem *audioItem );

aafiMarker * aafi_newMarker( AAF_Iface *aafi, aafRational_t *editRate, aafPosition_t start, aafPosition_t length, wchar_t *name, wchar_t *comment, uint16_t *RVBColor[3] );

Expand Down
76 changes: 38 additions & 38 deletions include/libaaf/AAFToText.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,82 +31,82 @@


#define AUIDToText( auid ) \
CLSIDToText( (const cfbCLSID_t*)auid )
cfb_CLSIDToText( (const cfbCLSID_t*)auid )


const wchar_t * MobIDToText( aafMobID_t *mobid );
const wchar_t * aaft_MobIDToText( aafMobID_t *mobid );

const wchar_t * TimestampToText( aafTimeStamp_t *ts );
const wchar_t * aaft_TimestampToText( aafTimeStamp_t *ts );

const wchar_t * VersionToText( aafVersionType_t *vers );
const wchar_t * aaft_VersionToText( aafVersionType_t *vers );

const wchar_t * ProductVersionToText( aafProductVersion_t *vers );
const wchar_t * aaft_ProductVersionToText( aafProductVersion_t *vers );

const wchar_t * FileKindToText( const aafUID_t *auid );
const wchar_t * aaft_FileKindToText( const aafUID_t *auid );

const wchar_t * TapeCaseTypeToText( aafTapeCaseType_t t );
const wchar_t * aaft_TapeCaseTypeToText( aafTapeCaseType_t t );

const wchar_t * VideoSignalTypeToText( aafVideoSignalType_t v );
const wchar_t * aaft_VideoSignalTypeToText( aafVideoSignalType_t v );

const wchar_t * TapeFormatTypeToText( aafTapeFormatType_t t );
const wchar_t * aaft_TapeFormatTypeToText( aafTapeFormatType_t t );

const wchar_t * FilmTypeToText( aafFilmType_t f );
const wchar_t * aaft_FilmTypeToText( aafFilmType_t f );

const wchar_t * SignalStandardToText( aafSignalStandard_t s );
const wchar_t * aaft_SignalStandardToText( aafSignalStandard_t s );

const wchar_t * FieldNumberToText( aafFieldNumber_t f );
const wchar_t * aaft_FieldNumberToText( aafFieldNumber_t f );

const wchar_t * AlphaTransparencyToText( aafAlphaTransparency_t a );
const wchar_t * aaft_AlphaTransparencyToText( aafAlphaTransparency_t a );

const wchar_t * FrameLayoutToText( aafFrameLayout_t f );
const wchar_t * aaft_FrameLayoutToText( aafFrameLayout_t f );

const wchar_t * ColorSitingToText( aafColorSiting_t c );
const wchar_t * aaft_ColorSitingToText( aafColorSiting_t c );

const wchar_t * ProductReleaseTypeToText( aafProductReleaseType_t t );
const wchar_t * aaft_ProductReleaseTypeToText( aafProductReleaseType_t t );

const wchar_t * FadeTypeToText( aafFadeType_t f );
const wchar_t * aaft_FadeTypeToText( aafFadeType_t f );

const wchar_t * BoolToText( aafBoolean_t b );
const wchar_t * aaft_BoolToText( aafBoolean_t b );

const wchar_t * OperationCategoryToText( const aafUID_t *auid );
const wchar_t * aaft_OperationCategoryToText( const aafUID_t *auid );

const wchar_t * PluginCategoryToText( const aafUID_t *auid );
const wchar_t * aaft_PluginCategoryToText( const aafUID_t *auid );

const wchar_t * ScanningDirectionToText( aafScanningDirection_t s );
const wchar_t * aaft_ScanningDirectionToText( aafScanningDirection_t s );

const wchar_t * ByteOrderToText( int16_t e );
const wchar_t * aaft_ByteOrderToText( int16_t e );

const wchar_t * ElectroSpatialToText( aafElectroSpatialFormulation_t e );
const wchar_t * aaft_ElectroSpatialToText( aafElectroSpatialFormulation_t e );

const wchar_t * TypeIDToText( const aafUID_t *auid );
const wchar_t * aaft_TypeIDToText( const aafUID_t *auid );

const wchar_t * StoredFormToText( enum aafStoredForm_e sf );
const wchar_t * aaft_StoredFormToText( enum aafStoredForm_e sf );

const wchar_t * OPDefToText( const aafUID_t *auid );
const wchar_t * aaft_OPDefToText( const aafUID_t *auid );

const wchar_t * DataDefToText( AAF_Data *aafd, const aafUID_t *auid );
const wchar_t * aaft_DataDefToText( AAF_Data *aafd, const aafUID_t *auid );

const wchar_t * OperationDefToText( AAF_Data *aafd, const aafUID_t *auid );
const wchar_t * aaft_OperationDefToText( AAF_Data *aafd, const aafUID_t *auid );

const wchar_t * InterpolationToText( const aafUID_t *auid );
const wchar_t * aaft_InterpolationToText( const aafUID_t *auid );

const wchar_t * ParameterToText( AAF_Data *aafd, const aafUID_t *auid );
const wchar_t * aaft_ParameterToText( AAF_Data *aafd, const aafUID_t *auid );

const wchar_t * TransferCharacteristicToText( const aafUID_t *auid );
const wchar_t * aaft_TransferCharacteristicToText( const aafUID_t *auid );

const wchar_t * CodingEquationsToText( const aafUID_t *auid );
const wchar_t * aaft_CodingEquationsToText( const aafUID_t *auid );

const wchar_t * ColorPrimariesToText( const aafUID_t *auid );
const wchar_t * aaft_ColorPrimariesToText( const aafUID_t *auid );

const wchar_t * UsageCodeToText( const aafUID_t *auid );
const wchar_t * aaft_UsageCodeToText( const aafUID_t *auid );

const wchar_t * PIDToText( AAF_Data *aafd, aafPID_t pid );
const wchar_t * aaft_PIDToText( AAF_Data *aafd, aafPID_t pid );

const wchar_t * ClassIDToText( AAF_Data *aafd, const aafUID_t *auid );
const wchar_t * aaft_ClassIDToText( AAF_Data *aafd, const aafUID_t *auid );

const wchar_t * ContainerToText( const aafUID_t *auid );
const wchar_t * aaft_ContainerToText( const aafUID_t *auid );

const wchar_t * CompressionToText( const aafUID_t *auid );
const wchar_t * aaft_CompressionToText( const aafUID_t *auid );


#endif // !__AAFToText_h__
2 changes: 1 addition & 1 deletion include/libaaf/LibCFB.h
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ typedef struct CFB_Data
*/


const wchar_t * CLSIDToText( const cfbCLSID_t *clsid );
const wchar_t * cfb_CLSIDToText( const cfbCLSID_t *clsid );

wchar_t * cfb_w16towchar( wchar_t *buf, uint16_t *w16buf, size_t w16blen );

Expand Down
6 changes: 3 additions & 3 deletions include/libaaf/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ struct dbg {



struct dbg * new_debug( void );
struct dbg * laaf_new_debug( void );

void free_debug( struct dbg *dbg );
void laaf_free_debug( struct dbg *dbg );

void debug_callback( struct dbg *dbg, void *ctxdata, int lib, int type, const char *srcfile, const char *srcfunc, int lineno, const char *msg, void *user );
void laaf_debug_callback( struct dbg *dbg, void *ctxdata, int lib, int type, const char *srcfile, const char *srcfunc, int lineno, const char *msg, void *user );


#endif // !__debug_h__
Loading

0 comments on commit 3e4c2cd

Please sign in to comment.