claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove warnings from mvprintw (as seen on OSX).

Browse Source
This commit is contained in:
rocky
2005-03-13 03:52:15 +00:00
parent 31796641ec
commit e80b06c4ce
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/cdda-player.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda-player.c,v 1.9 2005/03/13 03:37:18 rocky Exp $ $Id: cdda-player.c,v 1.10 2005/03/13 03:52:15 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -245,9 +245,9 @@ action(const char *psz_action)
} }
if (psz_action && strlen(psz_action)) if (psz_action && strlen(psz_action))
mvprintw(LINE_ACTION,0,"action : %s\n", psz_action); mvprintw(LINE_ACTION, 0, (char *) "action : %s\n", psz_action);
else else
mvprintw(LINE_ACTION,0,""); mvprintw(LINE_ACTION, 0, (char *) "");
clrtoeol(); clrtoeol();
refresh(); refresh();
} }
@@ -267,7 +267,7 @@ xperror(const char *psz_msg)
if (b_verbose) { if (b_verbose) {
sprintf(line,"%s: %s",psz_msg,strerror(errno)); sprintf(line,"%s: %s",psz_msg,strerror(errno));
mvprintw(LINE_ACTION, 0, "error : %-70s", line); mvprintw(LINE_ACTION, 0, (char *) "error : %-70s", line);
refresh(); refresh();
select_wait(3); select_wait(3);
action(NULL); action(NULL);
@@ -278,7 +278,7 @@ static void
oops(const char *psz_msg, int rc) oops(const char *psz_msg, int rc)
{ {
if (interactive) { if (interactive) {
mvprintw(LINE_LAST, 0, "%s, exiting...\n", psz_msg); mvprintw(LINE_LAST, 0, (char *) "%s, exiting...\n", psz_msg);
refresh(); refresh();
} }
tty_restore(); tty_restore();
@@ -569,7 +569,7 @@ display_status()
sprintf(line,"%s", mmc_audio_state2str(sub.audio_status)); sprintf(line,"%s", mmc_audio_state2str(sub.audio_status));
} }
mvprintw(LINE_STATUS, 0, "status%s: %s",auto_mode ? "*" : " ", line); mvprintw(LINE_STATUS, 0, (char *) "status%s: %s",auto_mode ? "*" : " ", line);
clrtoeol(); clrtoeol();
if (b_db && i_last_display_track != sub.track && if (b_db && i_last_display_track != sub.track &&
@@ -581,22 +581,22 @@ display_status()
if (i_first_audio_track != sub.track && if (i_first_audio_track != sub.track &&
strlen(cd_info[sub.track-1].title)) { strlen(cd_info[sub.track-1].title)) {
const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track-1]; const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track-1];
mvprintw(LINE_TRACK_PREV, 0, "track %2d title : %s [%s]", mvprintw(LINE_TRACK_PREV, 0, (char *) "track %2d title : %s [%s]",
sub.track-1, p_cd_info->title, sub.track-1, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB"); p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} else { } else {
mvprintw(LINE_TRACK_PREV, 0, "%s",""); mvprintw(LINE_TRACK_PREV, 0, (char *) "%s","");
clrtoeol(); clrtoeol();
} }
if (strlen(p_cd_info->title)) { if (strlen(p_cd_info->title)) {
mvprintw(LINE_TRACK_TITLE, 0, "track %2d title : %s [%s]", mvprintw(LINE_TRACK_TITLE, 0, (char *) "track %2d title : %s [%s]",
sub.track, p_cd_info->title, sub.track, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB"); (char *) p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} }
if (strlen(p_cd_info->artist)) { if (strlen(p_cd_info->artist)) {
mvprintw(LINE_TRACK_ARTIST, 0, "track %2d artist : %s [%s]", mvprintw(LINE_TRACK_ARTIST, 0, (char *) "track %2d artist : %s [%s]",
sub.track, p_cd_info->artist, sub.track, p_cd_info->artist,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB"); p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
@@ -604,12 +604,12 @@ display_status()
if (i_last_audio_track != sub.track && if (i_last_audio_track != sub.track &&
strlen(cd_info[sub.track+1].title)) { strlen(cd_info[sub.track+1].title)) {
const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track+1]; const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track+1];
mvprintw(LINE_TRACK_NEXT, 0, "track %2d title : %s [%s]", mvprintw(LINE_TRACK_NEXT, 0, (char *) "track %2d title : %s [%s]",
sub.track+1, p_cd_info->title, sub.track+1, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB"); p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} else { } else {
mvprintw(LINE_TRACK_NEXT, 0, "%s",""); mvprintw(LINE_TRACK_NEXT, 0, (char *) "%s","");
clrtoeol(); clrtoeol();
} }
clrtobot(); clrtobot();
@@ -677,7 +677,7 @@ get_track_info(track_t i_track)
#define display_line(LINE_NO, COL_NO, format_str, field) \ #define display_line(LINE_NO, COL_NO, format_str, field) \
if (field && field[0]) \ if (field && field[0]) \
mvprintw(LINE_NO, COL_NO, format_str, field); mvprintw(LINE_NO, COL_NO, (char *) format_str, field);
static void static void
display_cdinfo(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track) display_cdinfo(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track)
@@ -702,7 +702,8 @@ display_cdinfo(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track)
display_line(LINE_YEAR, 0, "CD Year : %4s", year); display_line(LINE_YEAR, 0, "CD Year : %4s", year);
} }
mvprintw(LINE_CDINFO, 0, "CD info: %-70s", line); mvprintw(LINE_CDINFO, 0, (char *) "CD info: %0s", line);
clrtoeol();
refresh(); refresh();
} }
@@ -763,7 +764,7 @@ list_keys()
{ {
unsigned int i; unsigned int i;
for (i=0; i < i_key_bindings; i++) { for (i=0; i < i_key_bindings; i++) {
mvprintw(LINE_TRACK_PREV+i, 0, "%s", key_bindings[i]); mvprintw(LINE_TRACK_PREV+i, 0, (char *) "%s", key_bindings[i]);
clrtoeol(); clrtoeol();
} }
{ {