|
|
ru.linux- RU.LINUX --------------------------------------------------------------------- From : vadim s. sabinich 2:5070/264 05 Feb 2004 05:16:09 To : All Subject : np-patch for mp3blaster3.2.0 --------------------------------------------------------------------------------
diff -Naur mp3blaster-3.2.0.orig/nmixer/getopt.h
mp3blaster-3.2.0/nmixer/getopt.h
-+- mp3blaster-3.2.0.orig/nmixer/getopt.h Tue Feb 3 14:15:44 2004
+++ mp3blaster-3.2.0/nmixer/getopt.h Tue Feb 3 14:14:01 2004
@@ -103,7 +103,7 @@
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+//extern int getopt ();
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
diff -Naur mp3blaster-3.2.0.orig/src/config.cc mp3blaster-3.2.0/src/config.cc
-+- mp3blaster-3.2.0.orig/src/config.cc Sat Sep 21 05:40:15 2002
+++ mp3blaster-3.2.0/src/config.cc Tue Feb 3 13:51:49 2004
@@ -162,6 +162,7 @@
{ "Key.Home", 2 },
{ "Key.End", 2 },
{ "PanSize", 0 },
+{ "NPFile", 15 },
{ NULL, 0 }, /* last entry's keyword MUST be NULL */
};
@@ -534,8 +535,13 @@
return 0;
}
break;
+ case 104:
+ {
+ globalopts.npfile=new char [strlen(values[0])];
+ strcpy(globalopts.npfile,values[0]);
+ break;
+ }
}
-
return 1;
}
diff -Naur mp3blaster-3.2.0.orig/src/getopt.h mp3blaster-3.2.0/src/getopt.h
-+- mp3blaster-3.2.0.orig/src/getopt.h Sat Sep 21 05:30:47 2002
+++ mp3blaster-3.2.0/src/getopt.h Tue Feb 3 14:15:28 2004
@@ -103,7 +103,7 @@
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+//extern int getopt ();
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
diff -Naur mp3blaster-3.2.0.orig/src/main.cc mp3blaster-3.2.0/src/main.cc
-+- mp3blaster-3.2.0.orig/src/main.cc Wed Sep 10 06:22:55 2003
+++ mp3blaster-3.2.0/src/main.cc Tue Feb 3 14:22:38 2004
@@ -334,6 +334,7 @@
int
main(int argc, char *argv[], char *envp[])
{
+ FILE *NP;
int
c,
long_index,
@@ -388,6 +389,12 @@
init_playopts();
set_default_colours(); // fill globalopts.colours with default values.
/* parse arguments */
+ if(globalopts.npfile!=NULL)
+ {
+ NP=fopen(globalopts.npfile,"w");
+ fprintf(NP,"mp3blaster is not active");
+ fclose(NP);
+ }
while (1)
{
static struct option long_options[] =
@@ -4591,25 +4598,51 @@
void
set_song_status(playstatus_t s)
{
- int maxy, maxx;
-
- getmaxyx(stdscr,maxy,maxx);
- move(maxy-3,1);
- switch(s)
- {
- case PS_PLAY: addstr("|>");break;
- case PS_PAUSE: addstr("||");break;
- case PS_REWIND: addstr("<<");break;
- case PS_FORWARD: addstr(">>");break;
- case PS_PREV: addstr("|<");break;
- case PS_NEXT: addstr(">|");break;
- case PS_STOP: addstr("[]"); mw_clear(); break;
- case PS_RECORD: addstr("()");break;
- default: break;
- }
- refresh();
-}
+ int maxy, maxx;
+ struct song_info &si = songinf.songinfo;
+ FILE *NP;
+
+ NP=fopen("/tmp/np","w");
+ getmaxyx(stdscr,maxy,maxx);
+ move(maxy-3,1);
+ switch(s)
+ {
+ case PS_PLAY: addstr("|>");fprintf(NP,"np: ");break;
+ case PS_PAUSE: addstr("||");fprintf(NP,"[pause]: ");break;
+ case PS_REWIND: addstr("<<");fprintf(NP,"[rwd] ");break;
+ case PS_FORWARD: addstr(">>");fprintf(NP,"[fwd]: ");break;
+ case PS_PREV: addstr("|<");fprintf(NP,"[prev]: ");break;
+ case PS_NEXT: addstr(">|");fprintf(NP,"[next]: ");break;
+ case PS_STOP: addstr("[]"); mw_clear(); fprintf(NP,"[stop]: "); break;
+ case PS_RECORD: addstr("()");fprintf(NP,"Recording ");break;
+ default: break;
+ }
+ refresh();
+ if (si.songname[0]=='\0')
+ fprintf(NP,"%s\n",songinf.path);
+ else
+ fprintf(NP,"%s/%s'%s/%s\n",(si.artist[0]=='\0' ? "<Unknown Artist>" :
si.artist), (si.album[0]=='\0' ? "_" : si.album),(si.year[0]=='\0' ? "_" :
si.year),si.songname);
+ fclose(NP);
+ }
+/* else {
+ switch(s)
+ {
+ case PS_PLAY: addstr("|>");break;
+ case PS_PAUSE: addstr("||");break;
+ case PS_REWIND: addstr("<<");break;
+ case PS_FORWARD: addstr(">>");break;
+ case PS_PREV: addstr("|<");break;
+ case PS_NEXT: addstr(">|");break;
+ case PS_STOP: addstr("[]"); mw_clear(); break;
+ case PS_RECORD: addstr("()");break;
+ default: break;
+ }
+ }
+
+ refresh();
+}
+*/
void
set_song_time(int elapsed, int remaining)
{
@@ -4971,6 +5004,7 @@
globalopts.selectitems_caseinsensitive = 1; //only works for regexp search
globalopts.scan_mp3s = 0; //scan mp3's to calculate correct total time.
globalopts.wraplist = true;
+ globalopts.npfile=NULL;
}
void
diff -Naur mp3blaster-3.2.0.orig/src/mp3blaster.h
mp3blaster-3.2.0/src/mp3blaster.h
-+- mp3blaster-3.2.0.orig/src/mp3blaster.h Sat Sep 21 05:40:15 2002
+++ mp3blaster-3.2.0/src/mp3blaster.h Tue Feb 3 14:07:06 2004
@@ -132,6 +132,7 @@
short scan_mp3s;
bool wraplist; // non-zero if user wants scrollwins to wrap on scrolling
short pan_size;
+ char *npfile;
};
enum keydescs { Main_SelectFiles, Fileman_AddFiles, Playwin_Previous };
--
np: Janis Joplin/Summertime'2001/Get It While You Can
--- tin/1.6.2-20030910 ("Pabbay") (UNIX) (FreeBSD/5.1-RELEASE (i386))
* Origin: PHOBOS BBS Irkutsk RU 7(3952) 323400 (2:5070/264)
Вернуться к списку тем, сортированных по: возрастание даты уменьшение даты тема автор
Архивное /ru.linux/3288be459de0.html, оценка из 5, голосов 10
|