diff options
author | greg <greg@blackbox> | 2009-06-18 17:54:08 +0200 |
---|---|---|
committer | greg <greg@blackbox> | 2009-06-20 03:38:00 +0200 |
commit | 2303b5430337da60f582613f95e605f08606759f (patch) | |
tree | 7ab52c9de634da3dfe55e1f36e87030beff2a3fe /libass/ass.h | |
parent | 9c7521c0224f16880870839f7492e50b1c8602f7 (diff) | |
download | libass-2303b5430337da60f582613f95e605f08606759f.tar.bz2 libass-2303b5430337da60f582613f95e605f08606759f.tar.xz |
Reindent all source code.
Reindent complete source code (*.c, *.h) with indent, the exact command
line being:
indent -kr -i4 -bap -nut -l76 *.c *.h
From now on, new code should use (more or less) K&R style,
only spaces and no tabs, 4 spaces indent width. Avoid long lines.
Fix function declaration pointer spacing.
Remove spaces that were added to many function declarations by indent,
like some_func(foo_t * bar).
Fix indenting of macros in ass.c
Diffstat (limited to 'libass/ass.h')
-rw-r--r-- | libass/ass.h | 99 |
1 files changed, 49 insertions, 50 deletions
diff --git a/libass/ass.h b/libass/ass.h index e98b4264..f5a989a7 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset: 8; indent-tabs-mode: t -*- -// vim:ts=8:sw=8:noet:ai: /* * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> * @@ -31,74 +29,70 @@ typedef struct ass_renderer_s ass_renderer_t; /// a linked list of images produced by ass renderer typedef struct ass_image_s { - int w, h; // bitmap width/height - int stride; // bitmap stride - unsigned char* bitmap; // 1bpp stride*h alpha buffer - uint32_t color; // RGBA - int dst_x, dst_y; // bitmap placement inside the video frame + int w, h; // bitmap width/height + int stride; // bitmap stride + unsigned char *bitmap; // 1bpp stride*h alpha buffer + uint32_t color; // RGBA + int dst_x, dst_y; // bitmap placement inside the video frame - struct ass_image_s* next; // linked list + struct ass_image_s *next; // linked list } ass_image_t; /// Hinting type -typedef enum {ASS_HINTING_NONE = 0, - ASS_HINTING_LIGHT, - ASS_HINTING_NORMAL, - ASS_HINTING_NATIVE +typedef enum { ASS_HINTING_NONE = 0, + ASS_HINTING_LIGHT, + ASS_HINTING_NORMAL, + ASS_HINTING_NATIVE } ass_hinting_t; /** * \brief initialize the library * \return library handle or NULL if failed */ -ass_library_t* ass_library_init(void); +ass_library_t *ass_library_init(void); /** * \brief finalize the library * \param priv library handle */ -void ass_library_done(ass_library_t*); +void ass_library_done(ass_library_t *); /** * \brief set private font directory * It is used for saving embedded fonts and also in font lookup. */ -void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir); +void ass_set_fonts_dir(ass_library_t *priv, const char *fonts_dir); -void ass_set_extract_fonts(ass_library_t* priv, int extract); +void ass_set_extract_fonts(ass_library_t *priv, int extract); -void ass_set_style_overrides(ass_library_t* priv, char** list); +void ass_set_style_overrides(ass_library_t *priv, char **list); /** * \brief initialize the renderer * \param priv library handle * \return renderer handle or NULL if failed */ -ass_renderer_t* ass_renderer_init(ass_library_t*); +ass_renderer_t *ass_renderer_init(ass_library_t *); /** * \brief finalize the renderer * \param priv renderer handle */ -void ass_renderer_done(ass_renderer_t* priv); +void ass_renderer_done(ass_renderer_t *priv); -void ass_set_frame_size(ass_renderer_t* priv, int w, int h); -void ass_set_margins(ass_renderer_t* priv, int t, int b, int l, int r); -void ass_set_use_margins(ass_renderer_t* priv, int use); -void ass_set_aspect_ratio(ass_renderer_t* priv, double ar); -void ass_set_font_scale(ass_renderer_t* priv, double font_scale); -void ass_set_hinting(ass_renderer_t* priv, ass_hinting_t ht); -void ass_set_line_spacing(ass_renderer_t* priv, double line_spacing); +void ass_set_frame_size(ass_renderer_t *priv, int w, int h); +void ass_set_margins(ass_renderer_t *priv, int t, int b, int l, int r); +void ass_set_use_margins(ass_renderer_t *priv, int use); +void ass_set_aspect_ratio(ass_renderer_t *priv, double ar); +void ass_set_font_scale(ass_renderer_t *priv, double font_scale); +void ass_set_hinting(ass_renderer_t *priv, ass_hinting_t ht); +void ass_set_line_spacing(ass_renderer_t *priv, double line_spacing); /** * \brief set font lookup defaults */ -int ass_set_fonts(ass_renderer_t* priv, const char* default_font, const char* default_family); - -/** - * \brief set font lookup defaults, don't use fontconfig even if it is available - */ -int ass_set_fonts_nofc(ass_renderer_t* priv, const char* default_font, const char* default_family); +int ass_set_fonts(ass_renderer_t *priv, const char *default_font, + const char *default_family, int fc); /** * \brief render a frame, producing a list of ass_image_t @@ -106,7 +100,8 @@ int ass_set_fonts_nofc(ass_renderer_t* priv, const char* default_font, const ch * \param track subtitle track * \param now video timestamp in milliseconds */ -ass_image_t* ass_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change); +ass_image_t *ass_render_frame(ass_renderer_t *priv, ass_track_t *track, + long long now, int *detect_change); // The following functions operate on track objects and do not need an ass_renderer // @@ -115,27 +110,27 @@ ass_image_t* ass_render_frame(ass_renderer_t *priv, ass_track_t* track, long lon * \brief allocate a new empty track object * \return pointer to empty track */ -ass_track_t* ass_new_track(ass_library_t*); +ass_track_t *ass_new_track(ass_library_t *); /** * \brief deallocate track and all its child objects (styles and events) * \param track track to deallocate */ -void ass_free_track(ass_track_t* track); +void ass_free_track(ass_track_t *track); /** * \brief allocate new style * \param track track * \return newly allocated style id */ -int ass_alloc_style(ass_track_t* track); +int ass_alloc_style(ass_track_t *track); /** * \brief allocate new event * \param track track * \return newly allocated event id */ -int ass_alloc_event(ass_track_t* track); +int ass_alloc_event(ass_track_t *track); /** * \brief delete a style @@ -143,7 +138,7 @@ int ass_alloc_event(ass_track_t* track); * \param sid style id * Deallocates style data. Does not modify track->n_styles. */ -void ass_free_style(ass_track_t* track, int sid); +void ass_free_style(ass_track_t *track, int sid); /** * \brief delete an event @@ -151,7 +146,7 @@ void ass_free_style(ass_track_t* track, int sid); * \param eid event id * Deallocates event data. Does not modify track->n_events. */ -void ass_free_event(ass_track_t* track, int eid); +void ass_free_event(ass_track_t *track, int eid); /** * \brief Parse a chunk of subtitle stream data. @@ -159,7 +154,7 @@ void ass_free_event(ass_track_t* track, int eid); * \param data string to parse * \param size length of data */ -void ass_process_data(ass_track_t* track, char* data, int size); +void ass_process_data(ass_track_t *track, char *data, int size); /** * \brief Parse Codec Private section of subtitle stream @@ -167,7 +162,7 @@ void ass_process_data(ass_track_t* track, char* data, int size); * \param data string to parse * \param size length of data */ -void ass_process_codec_private(ass_track_t* track, char *data, int size); +void ass_process_codec_private(ass_track_t *track, char *data, int size); /** * \brief Parse a chunk of subtitle stream data. In Matroska, this contains exactly 1 event (or a commentary). @@ -177,16 +172,18 @@ void ass_process_codec_private(ass_track_t* track, char *data, int size); * \param timecode starting time of the event (milliseconds) * \param duration duration of the event (milliseconds) */ -void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration); +void ass_process_chunk(ass_track_t *track, char *data, int size, + long long timecode, long long duration); -char* read_file_recode(char* fname, char* codepage, size_t* size); +char *read_file_recode(char *fname, char *codepage, size_t *size); /** * \brief Read subtitles from file. * \param fname file name * \return newly allocated track */ -ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage); +ass_track_t *ass_read_file(ass_library_t *library, char *fname, + char *codepage); /** * \brief Read subtitles from memory. @@ -196,12 +193,13 @@ ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage); * \param codepage recode buffer contents from given codepage * \return newly allocated track */ -ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize, char* codepage); +ass_track_t *ass_read_memory(ass_library_t *library, char *buf, + size_t bufsize, char *codepage); /** * \brief read styles from file into already initialized track * \return 0 on success */ -int ass_read_styles(ass_track_t* track, char* fname, char* codepage); +int ass_read_styles(ass_track_t *track, char *fname, char *codepage); /** * \brief Add a memory font. @@ -209,12 +207,13 @@ int ass_read_styles(ass_track_t* track, char* fname, char* codepage); * \param data binary font data * \param data_size data size */ -void ass_add_font(ass_library_t* library, char* name, char* data, int data_size); +void ass_add_font(ass_library_t *library, char *name, char *data, + int data_size); /** * \brief Remove all fonts stored in ass_library object */ -void ass_clear_fonts(ass_library_t* library); +void ass_clear_fonts(ass_library_t *library); /** * \brief Calculates timeshift from now to the start of some other subtitle event, depending on movement parameter @@ -224,6 +223,6 @@ void ass_clear_fonts(ass_library_t* library); * +2 means "the one after the next", -1 means "previous" * \return timeshift, ms */ -long long ass_step_sub(ass_track_t* track, long long now, int movement); +long long ass_step_sub(ass_track_t *track, long long now, int movement); -#endif /* LIBASS_ASS_H */ +#endif /* LIBASS_ASS_H */ |