diff -ur main/Gui/interface.c main.dev/Gui/interface.c --- main/Gui/interface.c 2004-10-02 20:06:17.000000000 +0400 +++ main.dev/Gui/interface.c 2004-09-27 02:00:30.000000000 +0400 @@ -1055,6 +1055,12 @@ return plCurrent; case gtkGetCurrPlItem: // get current item return plCurrent; + case gtkGetCurrPlItemPos: + current_pl_pos = 1; + for (current_pl_pos = 1, it = plList; + it && it != plCurrent; + it = it->next, current_pl_pos++); + return current_pl_pos; case gtkDelCurrPlItem: // delete current item { plItem * curr = plCurrent; diff -ur main/Gui/interface.h main.dev/Gui/interface.h --- main/Gui/interface.h 2003-08-15 15:55:21.000000000 +0400 +++ main.dev/Gui/interface.h 2004-09-27 01:59:35.000000000 +0400 @@ -199,6 +199,7 @@ #define gtkDelCurrPlItem 23 #define gtkInsertPlItem 24 #define gtkSetCurrPlItem 25 +#define gtkGetCurrPlItemPos 26 extern float gtkEquChannels[6][10]; diff -ur main/Gui/mplayer/gtk/fs.c main.dev/Gui/mplayer/gtk/fs.c --- main/Gui/mplayer/gtk/fs.c 2004-10-02 20:06:39.000000000 +0400 +++ main.dev/Gui/mplayer/gtk/fs.c 2004-09-27 03:55:45.000000000 +0400 @@ -492,6 +492,7 @@ guiSetDF( guiIntfStruct.Filename,fsSelectedDirectory,fsSelectedFile ); guiIntfStruct.StreamType=STREAMTYPE_FILE; guiIntfStruct.FilenameChanged=1; sub_fps=0; + guiIntfStruct.Track = 1; gfree( (void **)&guiIntfStruct.AudioFile ); gfree( (void **)&guiIntfStruct.Subtitlename ); fs_PersistantHistory( fsSelectedDirectory ); //totem, write into history @@ -507,6 +508,7 @@ break; case fsAudioSelector: guiSetDF( guiIntfStruct.AudioFile,fsSelectedDirectory,fsSelectedFile ); + guiIntfStruct.Track = 1; break; case fsFontSelector: guiSetDF( font_name,fsSelectedDirectory,fsSelectedFile ); diff -ur main/Gui/mplayer/play.c main.dev/Gui/mplayer/play.c --- main/Gui/mplayer/play.c 2004-03-26 00:49:48.000000000 +0300 +++ main.dev/Gui/mplayer/play.c 2004-09-27 02:04:54.000000000 +0400 @@ -265,6 +265,7 @@ // filename=guiIntfStruct.Filename; guiIntfStruct.StreamType=type; + guiIntfStruct.Track = (int) gtkSet(gtkGetCurrPlItemPos,0,NULL); gfree( (void **)&guiIntfStruct.AudioFile ); gfree( (void **)&guiIntfStruct.Subtitlename ); }