You need to sign in or sign up before continuing.
Commit 1e9b1665 authored by Warren Dukes's avatar Warren Dukes

some cleanups for utf8 in playerSeek and using strncpy for copying filenames

git-svn-id: https://svn.musicpd.org/mpd/trunk@54 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 46c66a2a
......@@ -165,7 +165,7 @@ int playerPlay(FILE * fp, char * utf8file) {
return 0;
}
strcpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)));
strncpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)),MAXPATHLEN);
pc->play = 1;
if(player_pid==0 && playerInit()<0) {
......@@ -295,7 +295,7 @@ int queueSong(char * utf8file) {
PlayerControl * pc = &(getPlayerData()->playerControl);
if(pc->queueState==PLAYER_QUEUE_BLANK) {
strcpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)));
strncpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)),MAXPATHLEN);
if(0);
#ifdef HAVE_MAD
......@@ -352,8 +352,9 @@ void playerQueueUnlock() {
}
}
int playerSeek(FILE * fp, char * file, float time) {
int playerSeek(FILE * fp, char * utf8file, float time) {
PlayerControl * pc = &(getPlayerData()->playerControl);
char * file;
if(pc->state==PLAYER_STATE_STOP) {
myfprintf(fp,"%s player not currently playing\n",
......@@ -361,7 +362,8 @@ int playerSeek(FILE * fp, char * file, float time) {
return -1;
}
if(strcmp(pc->file,rmp2amp(file))!=0) strcpy(pc->file,rmp2amp(file));
file = rmp2amp(utf8ToFsCharset(utf8file));
if(strcmp(pc->file,file)!=0) strncpy(pc->file,file,MAXPATHLEN);
/*if(playerStop(fp)<0) return -1;
if(playerPlay(stderr,file)<0) return -1;*/
/*}*/
......
......@@ -113,7 +113,7 @@ void playerQueueLock();
void playerQueueUnlock();
int playerSeek(FILE * fp, char * file, float time);
int playerSeek(FILE * fp, char * utf8file, float time);
void setPlayerCrossFade(float crossFadeInSeconds);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment