r33035 - in trunk/gui: app.h bitmap.h mplayer/play.h skin/cut.h skin/font.h skin/skin.h
Author: ib Date: Sun Mar 6 14:57:21 2011 New Revision: 33035 Log: Add variable names to prototype declarations. Modified: trunk/gui/app.h trunk/gui/bitmap.h trunk/gui/mplayer/play.h trunk/gui/skin/cut.h trunk/gui/skin/font.h trunk/gui/skin/skin.h Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/app.h Sun Mar 6 14:57:21 2011 (r33035) @@ -192,10 +192,10 @@ typedef struct { extern guiItems appMPlayer; -int appFindMessage(unsigned char *); +int appFindMessage(unsigned char *str); void appFreeStruct(void); void appInitStruct(void); -void btnModify(int, float); -void btnSet(int, int); +void btnModify(int event, float state); +void btnSet(int event, int set); #endif /* MPLAYER_GUI_APP_H */ Modified: trunk/gui/bitmap.h ============================================================================== --- trunk/gui/bitmap.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/bitmap.h Sun Mar 6 14:57:21 2011 (r33035) @@ -27,8 +27,8 @@ typedef struct { char *Image; } txSample; -void bpFree(txSample *); -int bpRead(char *, txSample *); -void Convert32to1(txSample *, txSample *, int); +void bpFree(txSample *bf); +int bpRead(char *fname, txSample *bf); +void Convert32to1(txSample *in, txSample *out, int adaptivlimit); #endif /* MPLAYER_GUI_BITMAP_H */ Modified: trunk/gui/mplayer/play.h ============================================================================== --- trunk/gui/mplayer/play.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/mplayer/play.h Sun Mar 6 14:57:21 2011 (r33035) @@ -21,8 +21,8 @@ extern int mplGotoTheNext; -void ChangeSkin(char *); -void mplAbsSeek(float); +void ChangeSkin(char *name); +void mplAbsSeek(float s); void mplCurr(void); void mplEnd(void); void mplFullScreen(void); @@ -30,8 +30,8 @@ void mplNext(void); void mplPause(void); void mplPlay(void); void mplPrev(void); -void mplRelSeek(float); -void mplSetFileName(char *, char *, int); +void mplRelSeek(float s); +void mplSetFileName(char *dir, char *name, int type); void mplState(void); #endif /* MPLAYER_GUI_PLAY_H */ Modified: trunk/gui/skin/cut.h ============================================================================== --- trunk/gui/skin/cut.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/skin/cut.h Sun Mar 6 14:57:21 2011 (r33035) @@ -23,7 +23,7 @@ #define cutItem(in, out, sep, num) cutItemString(in, out, sep, num, sizeof(out)) -void cutItemString(char *, char *, char, int, size_t); -int cutItemToInt(char *, char, int); +void cutItemString(char *in, char *out, char sep, int num, size_t maxout); +int cutItemToInt(char *in, char sep, int num); #endif /* MPLAYER_GUI_CUT_H */ Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/skin/font.h Sun Mar 6 14:57:21 2011 (r33035) @@ -45,10 +45,10 @@ typedef struct { char name[MAX_FONT_NAME]; } bmpFont; -int fntFindID(char *); +int fntFindID(char *name); void fntFreeFont(void); -int fntRead(char *, char *); -txSample *fntRender(wItem *, int, char *); -int fntTextWidth(int, char *); +int fntRead(char *path, char *fname); +txSample *fntRender(wItem *item, int px, char *txt); +int fntTextWidth(int id, char *str); #endif /* MPLAYER_GUI_FONT_H */ Modified: trunk/gui/skin/skin.h ============================================================================== --- trunk/gui/skin/skin.h Sun Mar 6 14:04:07 2011 (r33034) +++ trunk/gui/skin/skin.h Sun Mar 6 14:57:21 2011 (r33035) @@ -21,9 +21,9 @@ #include "gui/bitmap.h" -int skinBPRead(char *, txSample *); -int skinRead(char *); -char *strswap(char *, char, char); -char *trim(char *); +int skinBPRead(char *fname, txSample *bf); +int skinRead(char *dname); +char *strswap(char *in, char what, char whereof); +char *trim(char *in); #endif /* MPLAYER_GUI_SKIN_H */
On Sun, Mar 06, 2011 at 02:57:22PM +0100, ib wrote:
+char *strswap(char *in, char what, char whereof);
Hm, I think "whereof" makes no sense, maybe it would be easier to understand if the names where either "what"/"with" or "from"/"to"? Or something else? Not really sure, just thought "whereof" sounds bad.
Reimar Döffinger wrote on Sun, 6 Mar 2011 15:27:38 +0100:
On Sun, Mar 06, 2011 at 02:57:22PM +0100, ib wrote:
+char *strswap(char *in, char what, char whereof);
Hm, I think "whereof" makes no sense, maybe it would be easier to understand if the names where either "what"/"with" or "from"/"to"? Or something else? Not really sure, just thought "whereof" sounds bad.
I merely copied the variable names from the .c files to the header files. When I'm working through skin.c I will change odd naming (and change this in the header file as well where it is now noted redundantly). Ingo
On Sun, Mar 06, 2011 at 02:57:22PM +0100, ib wrote:
Log: Add variable names to prototype declarations.
Thanks. Diego
participants (4)
-
Diego Biurrun -
ib -
Ingo Brückl -
Reimar Döffinger