Packman Build Service PMBS

mpfc.spec Changed

@@ -3,16 +3,18 @@
 %define soname 0
 
 Name:               mpfc
-Version:            1.3.8
+Version:            1.3.8.1
 Release:            0.pm.1
 Summary:            Music Player for Linux Console
 # http://prdownloads.sourceforge.net/mpfc/mpfc-%{version}.tar.gz
 Source:             mpfc-%{version}.tar.bz2
 Source1:            mpfc.desktop
-Patch1:             mpfc-fix_libdir.patch
-Patch2:             mpfc-fix_buffer_overflow.patch
+# pbleser: use getaddrinfo() instead of gethostbyname() as the former also supports IPv6
+Patch1:             mpfc-getaddrinfo.patch
+# pbleser: fix missing standard library include(s)
+Patch2:             mpfc-fix_missing_std_headers.patch
+# pbleser: fix missing includes and declarations from internal code
 Patch3:             mpfc-fix_missing_includes.patch
-Patch4:             mpfc-fix_missing_return_in_non_void_functions.patch
 Source99:           mpfc-rpmlintrc
 URL:                http://sourceforge.net/projects/mpfc/
 Group:              Productivity/Multimedia/Sound/Players
@@ -69,9 +71,9 @@
 %patch1
 %patch2
 %patch3
-%patch4
 
 %build
+CFLAGS="%{optflags} -Wall -Wno-unused -I/usr/include/ncursesw" \
 %configure \
     --disable-rpath \
     --enable-gpm \

mpfc-fix_buffer_overflow.patch Deleted

mpfc-fix_libdir.patch Deleted

@@ -1,263 +0,0 @@
---- plugins/output/disk_writer/Makefile.in.orig	2011-03-12 23:50:38.000000000 +0100
-+++ plugins/output/disk_writer/Makefile.in	2011-03-12 23:50:44.000000000 +0100
-@@ -248,7 +248,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/output
-+libdir = @libdir@/mpfc/output
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
---- plugins/output/disk_writer/Makefile.am.orig	2011-03-12 23:50:30.000000000 +0100
-+++ plugins/output/disk_writer/Makefile.am	2011-03-12 23:50:36.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libdisk_writer.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+libdir = $(libdir)/mpfc/output
- 
- libdisk_writer_la_SOURCES = writer.c
- libdisk_writer_la_LIBADD = @COMMON_LIBS@
---- plugins/output/alsa/Makefile.in.orig	2011-03-12 23:50:19.000000000 +0100
-+++ plugins/output/alsa/Makefile.in	2011-03-12 23:50:25.000000000 +0100
-@@ -248,7 +248,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/output
-+libdir = @libdir@/mpfc/output
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
---- plugins/output/alsa/Makefile.am.orig	2011-03-12 23:50:10.000000000 +0100
-+++ plugins/output/alsa/Makefile.am	2011-03-12 23:50:16.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libalsa.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+libdir = $(libdir)/mpfc/output
- 
- libalsa_la_SOURCES = alsa.c
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
---- plugins/output/oss/Makefile.in.orig	2011-03-12 23:50:56.000000000 +0100
-+++ plugins/output/oss/Makefile.in	2011-03-12 23:51:05.000000000 +0100
-@@ -248,7 +248,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/output
-+libdir = @libdir@/mpfc/output
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
---- plugins/output/oss/Makefile.am.orig	2011-03-12 23:50:48.000000000 +0100
-+++ plugins/output/oss/Makefile.am	2011-03-12 23:50:54.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = liboss.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+libdir = $(libdir)/mpfc/output
- 
- liboss_la_SOURCES = oss.c
- liboss_la_LIBADD = @COMMON_LIBS@
---- plugins/input/flac/Makefile.in.orig	2011-03-12 23:48:53.000000000 +0100
-+++ plugins/input/flac/Makefile.in	2011-03-12 23:49:01.000000000 +0100
-@@ -251,7 +251,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
---- plugins/input/flac/Makefile.am.orig	2011-03-12 23:48:44.000000000 +0100
-+++ plugins/input/flac/Makefile.am	2011-03-12 23:48:51.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libflac.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libflac_la_SOURCES = flac.c
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
---- plugins/input/cue/Makefile.in.orig	2011-03-12 23:47:07.000000000 +0100
-+++ plugins/input/cue/Makefile.in	2011-03-12 23:47:17.000000000 +0100
-@@ -251,7 +251,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
---- plugins/input/cue/Makefile.am.orig	2011-03-12 23:47:37.000000000 +0100
-+++ plugins/input/cue/Makefile.am	2011-03-12 23:48:03.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libcue.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libcue_la_SOURCES = cue.c cue_sheet.c cue_sheet.h
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
---- plugins/input/ogg/Makefile.in.orig	2011-03-12 23:49:38.000000000 +0100
-+++ plugins/input/ogg/Makefile.in	2011-03-12 23:49:44.000000000 +0100
-@@ -251,7 +251,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
---- plugins/input/ogg/Makefile.am.orig	2011-03-12 23:49:29.000000000 +0100
-+++ plugins/input/ogg/Makefile.am	2011-03-12 23:49:36.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libogg_vorbis.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
---- plugins/input/audiocd/Makefile.in.orig	2011-03-12 23:48:26.000000000 +0100
-+++ plugins/input/audiocd/Makefile.in	2011-03-12 23:48:39.000000000 +0100
-@@ -248,7 +248,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
---- plugins/input/audiocd/Makefile.am.orig	2011-03-12 23:48:17.000000000 +0100
-+++ plugins/input/audiocd/Makefile.am	2011-03-12 23:48:24.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libaudiocd.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
- libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
---- plugins/input/wav/Makefile.in.orig	2011-03-12 23:49:57.000000000 +0100
-+++ plugins/input/wav/Makefile.in	2011-03-12 23:50:03.000000000 +0100
-@@ -248,7 +248,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
---- plugins/input/wav/Makefile.am.orig	2011-03-12 23:49:49.000000000 +0100
-+++ plugins/input/wav/Makefile.am	2011-03-12 23:49:55.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libwav.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libwav_la_SOURCES = wav.c wav.h
- libwav_la_LIBADD = @COMMON_LIBS@
---- plugins/input/mp3/Makefile.in.orig	2011-03-12 23:49:16.000000000 +0100
-+++ plugins/input/mp3/Makefile.in	2011-03-12 23:49:24.000000000 +0100
-@@ -251,7 +251,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/mpfc/input
-+libdir = @libdir@/mpfc/input
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
---- plugins/input/mp3/Makefile.am.orig	2011-03-12 23:49:06.000000000 +0100
-+++ plugins/input/mp3/Makefile.am	2011-03-12 23:49:15.000000000 +0100
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libmp3.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+libdir = $(libdir)/mpfc/input
- 
- libmp3_la_SOURCES = mp3.c mp3.h 
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
---- libmpfcwnd/Makefile.in.orig	2011-03-12 23:19:22.000000000 +0100
-+++ libmpfcwnd/Makefile.in	2011-03-12 23:19:48.000000000 +0100
-@@ -260,7 +260,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/
-+libdir = @libdir@
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
-@@ -280,7 +280,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = libmpfcwnd.la
--libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd
-+libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
- libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
- 						wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \
- 						wnd_basic.h wnd_class.h wnd_dialog.h wnd_dlgitem.h \
---- libmpfcwnd/Makefile.am.orig	2011-03-12 23:18:35.000000000 +0100
-+++ libmpfcwnd/Makefile.am	2011-03-12 23:19:17.000000000 +0100
-@@ -1,6 +1,5 @@
- lib_LTLIBRARIES = libmpfcwnd.la
--libdir = $(prefix)/lib/
--libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd
-+libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
- libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
- 						wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \
- 						wnd_basic.h wnd_class.h wnd_dialog.h wnd_dlgitem.h \
---- libmpfc/Makefile.in.orig	2011-03-12 23:18:09.000000000 +0100
-+++ libmpfc/Makefile.in	2011-03-12 23:20:16.000000000 +0100
-@@ -257,7 +257,7 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = $(prefix)/lib/
-+libdir = @libdir@
- libexecdir = @libexecdir@
- localedir = $(datadir)/locale
- localstatedir = @localstatedir@
-@@ -277,7 +277,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = libmpfc.la
--libmpfchdrdir = $(prefix)/include/mpfc
-+libmpfchdrdir = $(includedir)/mpfc
- libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
- 					 ../src/charset.h \
- 					 ../src/file.h file_http.h file_reg.h \
---- libmpfc/Makefile.am.orig	2011-03-12 23:17:41.000000000 +0100
-+++ libmpfc/Makefile.am	2011-03-12 23:19:59.000000000 +0100
-@@ -1,8 +1,6 @@
- lib_LTLIBRARIES = libmpfc.la
- 
--libdir = $(prefix)/lib/
--
--libmpfchdrdir = $(prefix)/include/mpfc
-+libmpfchdrdir = $(includedir)/mpfc
- libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
- 					 ../src/charset.h \
- 					 ../src/file.h file_http.h file_reg.h \
---- mpfc.pc.in.orig	2011-03-12 23:20:27.000000000 +0100
-+++ mpfc.pc.in	2011-03-12 23:21:49.000000000 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@libdir@
-+includedir=@includedir@
- plugindir=${libdir}/mpfc
- 
- Name: mpfc

mpfc-fix_missing_includes.patch Changed

@@ -1,84 +1,28 @@
---- plugins/output/disk_writer/writer.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/output/disk_writer/writer.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,8 @@
-  * MA 02111-1307, USA.
-  */
- 
-+#include <stdlib.h>
-+#include <unistd.h>
- #include <stdio.h>
- #include <string.h>
- #include <sys/soundcard.h>
-@@ -31,6 +33,8 @@
+--- libmpfcwnd/wnd_repval.c.orig	2011-03-13 21:47:14.000000000 +0100
++++ libmpfcwnd/wnd_repval.c	2011-03-13 21:47:30.000000000 +0100
+@@ -25,6 +25,7 @@
  #include "wnd_dialog.h"
- #include "wnd_checkbox.h"
  #include "wnd_editbox.h"
-+#include "wnd_filebox.h"
-+#include "util.h"
- 
- /* Header size */
- #define DW_HEAD_SIZE 44
---- plugins/output/oss/oss.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/output/oss/oss.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <fcntl.h>
---- plugins/input/cue/cue.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/input/cue/cue.c	2011-03-13 00:19:48.000000000 +0100
-@@ -21,6 +21,7 @@
-  */
- 
- //#include "config.h"
-+#include <ctype.h>
- #define __MPFC_OUTER__
- #include <stdio.h>
- #include <stdlib.h>
---- plugins/input/ogg/ogg.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/input/ogg/ogg.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- plugins/input/audiocd/audiocd.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/input/audiocd/audiocd.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <limits.h>
- #include <linux/cdrom.h>
---- libmpfcwnd/wnd_def_handlers.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ libmpfcwnd/wnd_def_handlers.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
+ #include "wnd_repval.h"
++#include "wnd_label.h"
  
-+#include <strings.h>
- #include <assert.h>
- #include <stdlib.h>
- #include "types.h"
---- libmpfcwnd/wnd_editbox.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ libmpfcwnd/wnd_editbox.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
+ /* Create a repeat value dialog */
+ dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
+--- libmpfcwnd/wnd_filebox.c.orig	2011-03-13 21:45:32.000000000 +0100
++++ libmpfcwnd/wnd_filebox.c	2011-03-13 21:46:28.000000000 +0100
+@@ -33,6 +33,9 @@
+ #include "wnd_editbox.h"
+ #include "wnd_filebox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++
++extern int mbslen( char *str );
  
-+#include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
- #include "types.h"
-@@ -28,6 +29,9 @@
+ /* Create a new file box */
+ filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+--- libmpfcwnd/wnd_combobox.c.orig	2011-03-13 21:46:39.000000000 +0100
++++ libmpfcwnd/wnd_combobox.c	2011-03-13 21:47:06.000000000 +0100
+@@ -28,6 +28,9 @@
  #include "wnd_dlgitem.h"
  #include "wnd_editbox.h"
  #include "wnd_hbox.h"
@@ -86,44 +30,117 @@
 +
 +extern int mbslen( char *str );
  
- /* Create a new edit box */
- editbox_t *editbox_new( wnd_t *parent, char *id, char *text, char letter,
---- libmpfcwnd/wnd_root.c.orig	2011-03-13 00:19:55.000000000 +0100
-+++ libmpfcwnd/wnd_root.c	2011-03-13 00:20:19.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
- 
-+#include <string.h>
- #include <assert.h>
- #include <stdlib.h>
+ /* Create a new combo box */
+ combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
+--- libmpfcwnd/wnd_print.c.orig	2011-03-13 21:44:42.000000000 +0100
++++ libmpfcwnd/wnd_print.c	2011-03-13 21:44:50.000000000 +0100
+@@ -32,6 +32,7 @@
  #include "types.h"
---- src/plist.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ src/plist.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
+ #include "wnd.h"
+ #include "wnd_print.h"
++#include "util.h"
  
-+#include <ctype.h>
- #include <pthread.h>
+ /* Move cursor to a specified position */
+ void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
+--- libmpfcwnd/wnd_mouse.c.orig	2011-03-13 21:45:09.000000000 +0100
++++ libmpfcwnd/wnd_mouse.c	2011-03-13 21:45:14.000000000 +0100
+@@ -27,6 +27,7 @@
  #include <stdlib.h>
- #include <stdio.h>
-@@ -36,6 +37,8 @@
- #include "undo.h"
+ #include <string.h>
+ #include "wnd.h"
++#include "util.h"
+ 
+ /* Initialize mouse */
+ wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
+--- libmpfcwnd/wnd.c.orig	2011-03-13 21:43:05.000000000 +0100
++++ libmpfcwnd/wnd.c	2011-03-13 21:54:48.000000000 +0100
+@@ -29,6 +29,9 @@
+ #include "logger.h"
  #include "wnd.h"
+ #include "wnd_root.h"
++#include "util.h"
++
++extern int mbslen( char *str );
+ 
+ /* Initialize window system and create root window */
+ wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
+--- src/info_rw_thread.c.orig	2011-03-13 21:50:18.000000000 +0100
++++ src/info_rw_thread.c	2011-03-13 21:50:35.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include "info_rw_thread.h"
+ #include "player.h"
+ #include "song.h"
++#include "util.h"
  
+ /* Thread queue */
+ irw_queue_t *irw_head, *irw_tail;
+--- src/player.c.orig	2011-03-13 21:47:47.000000000 +0100
++++ src/player.c	2011-03-13 21:58:43.000000000 +0100
+@@ -58,7 +58,15 @@
+ #include "wnd_multiview_dialog.h"
+ #include "wnd_radio.h"
+ #include "wnd_root.h"
++#include "wnd_repval.h"
+ #include "xconvert.h"
++#include "info_rw_thread.h"
++#include "outp.h"
++#include "inp.h"
++#include "genp.h"
++extern void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
++extern dword inp_get_flags( in_plugin_t *p );
 +extern void pmng_hook( pmng_t *pmng, char *hook );
+ 
+ /*****
+  *
+--- src/plist.c.orig	2011-03-13 21:58:13.000000000 +0100
++++ src/plist.c	2011-03-13 21:58:20.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "util.h"
+ #include "undo.h"
+ #include "wnd.h"
++#include "info_rw_thread.h"
+ 
+ extern void pmng_hook( pmng_t *pmng, char *hook );
+ 
+--- libmpfc/id3.c.orig	2011-03-13 21:41:08.000000000 +0100
++++ libmpfc/id3.c	2011-03-13 21:41:21.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <unicode/ucnv.h>
+ #include "types.h"
+ #include "myid3.h"
++#include "util.h"
+ 
+ /* Create a new empty tag */
+ id3_tag_t *id3_new( void )
+--- libmpfc/logger.c.orig	2011-03-13 21:42:40.000000000 +0100
++++ libmpfc/logger.c	2011-03-13 21:42:49.000000000 +0100
+@@ -28,6 +28,8 @@
+ #include "cfg.h"
+ #include "logger.h"
+ 
++int logger_get_level( logger_t *log );
 +
- /* Number of files added by plist_add_set */
- int plist_num = 0;
+ /* Initialize logger */
+ logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
+ {
+--- libmpfc/vfs.c.orig	2011-03-13 21:42:13.000000000 +0100
++++ libmpfc/vfs.c	2011-03-13 21:42:28.000000000 +0100
+@@ -33,6 +33,8 @@
+ #include "vfs.h"
+ #include "util.h"
  
---- libmpfc/vfs.c.orig	2011-03-12 21:15:07.000000000 +0100
-+++ libmpfc/vfs.c	2011-03-13 00:19:48.000000000 +0100
-@@ -20,6 +20,7 @@
-  * MA 02111-1307, USA.
-  */
++extern dword inp_get_flags( in_plugin_t *p );
++
+ /* Check if symbol is a special pattern symbol */
+ #define VFS_SYM_SPECIAL(ch, space_is_special) \
+ 		((ch) == '*' || (ch) == '?' || (ch) == '' || (ch) == '' || \
+--- libmpfc/file_http.c.orig	2011-03-13 21:40:51.000000000 +0100
++++ libmpfc/file_http.c	2011-03-13 21:41:02.000000000 +0100
+@@ -35,6 +35,7 @@
+ #include "file.h"
+ #include "file_http.h"
+ #include "mystring.h"
++#include "util.h"
  
-+#include <ctype.h>
- #include <dirent.h>
- #include <fnmatch.h>
- #include <stdlib.h>
+ /* Get file data */
+ #define FHTTP_GET_DATA(data, file) \

mpfc-fix_missing_return_in_non_void_functions.patch Deleted

@@ -1,180 +0,0 @@
---- plugins/input/audiocd/audiocd.c.orig	2011-03-12 21:15:05.000000000 +0100
-+++ plugins/input/audiocd/audiocd.c	2011-03-13 00:15:59.000000000 +0100
-@@ -447,7 +447,7 @@
- 	track = acd_fname2trk(filename);
- 	if (track < 0 || track >= acd_num_tracks || 
- 			track > acd_tracks_infoacd_num_tracks - 1.m_number)
--		return;
-+		return FALSE;
- 
- 	/* Save info */
- 	return cddb_save_trk_info(track, info);
---- libmpfcwnd/wnd_listbox.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ libmpfcwnd/wnd_listbox.c	2011-03-13 00:15:59.000000000 +0100
-@@ -95,7 +95,7 @@
- 	lb->m_list = (struct listbox_item_t *)realloc(lb->m_list, 
- 			sizeof(struct listbox_item_t) * (lb->m_list_size + 1));
- 	if (lb->m_list == NULL)
--		return;
-+		return -1;
- 	pos = lb->m_list_size;
- 	lb->m_listpos.m_name = strdup(item);
- 	lb->m_listpos.m_data = data;
---- libmpfcwnd/wnd_radio.c.orig	2011-03-13 00:19:08.000000000 +0100
-+++ libmpfcwnd/wnd_radio.c	2011-03-13 00:19:21.000000000 +0100
-@@ -105,6 +105,7 @@
- 	wnd_putchar(wnd, 0, ' ');
- 	dlgitem_display_label_text(wnd, wnd->m_title);
- 	wnd_move(wnd, 0, 1, 0);
-+    return WND_MSG_RETCODE_OK;
- } /* End of 'radio_on_display' function */
- 
- /* 'mouse_ldown' message handler */
---- libmpfcwnd/wnd_label.c.orig	2011-03-13 00:18:12.000000000 +0100
-+++ libmpfcwnd/wnd_label.c	2011-03-13 00:19:03.000000000 +0100
-@@ -122,6 +122,7 @@
- 	wnd_move(wnd, 0, 0, 0);
- 	wnd_apply_default_style(wnd);
- 	dlgitem_display_label_text(wnd, wnd->m_title);
-+    return WND_MSG_RETCODE_OK;
- } /* End of 'label_on_display' function */
- 
- /* Initialize label class */
---- libmpfcwnd/wnd_checkbox.c.orig	2011-03-13 00:17:53.000000000 +0100
-+++ libmpfcwnd/wnd_checkbox.c	2011-03-13 00:18:05.000000000 +0100
-@@ -98,6 +98,7 @@
- 	wnd_putchar(wnd, 0, ' ');
- 	dlgitem_display_label_text(wnd, wnd->m_title);
- 	wnd_move(wnd, 0, 1, 0);
-+	return WND_MSG_RETCODE_OK;
- } /* End of 'checkbox_on_display' function */
- 
- /* 'mouse_ldown' message handler */
---- src/player.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ src/player.c	2011-03-13 00:15:59.000000000 +0100
-@@ -1664,7 +1664,7 @@
- 	int len, base, song;
- 	
- 	if (player_plist == NULL || !player_plist->m_len)
--		return;
-+		return -1;
- 	
- 	/* Change current song */
- 	song = player_plist->m_cur_song;
---- src/browser.c.orig	2011-03-13 00:16:09.000000000 +0100
-+++ src/browser.c	2011-03-13 00:16:39.000000000 +0100
-@@ -346,6 +346,7 @@
- 		fb_help(fb);
- 	}
- 	wnd_invalidate(wnd);
-+	return WND_MSG_RETCODE_OK;
- } /* End of 'fb_on_action' function */
- 
- /* Handle mouse left button */
---- src/plist.c.orig	2011-03-12 21:15:06.000000000 +0100
-+++ src/plist.c	2011-03-13 00:15:59.000000000 +0100
-@@ -711,7 +711,7 @@
- 
- 	assert(pl);
- 	if (!pl->m_len)
--		return;
-+		return FALSE;
- 
- 	/* Search */
- 	for ( i = pl->m_sel_end, count = 0; count < pl->m_len && !found; count ++ )
---- libmpfc/id3.c.orig	2011-03-12 21:15:07.000000000 +0100
-+++ libmpfc/id3.c	2011-03-13 00:15:59.000000000 +0100
-@@ -112,7 +112,7 @@
- 	bool_t ret1, ret2;
- 
- 	if (tag == NULL || filename == NULL)
--		return;
-+		return FALSE;
- 
- 	/* Write tags */
- 	ret1 = id3_v1_write(&tag->m_v1, filename);
-@@ -323,7 +323,7 @@
- 	if (data == NULL)
- 	{
- 		fclose(fd);
--		return;
-+		return FALSE;
- 	}
- 
- 	/* Fill data */
-@@ -337,7 +337,7 @@
- 	if (fd == NULL)
- 	{
- 		free(data);
--		return;
-+		return NULL;
- 	}
- 	fwrite(data, 1, file_size + size, fd);
- 	fclose(fd);
---- libmpfc/file.c.orig	2011-03-12 21:15:07.000000000 +0100
-+++ libmpfc/file.c	2011-03-13 00:17:17.000000000 +0100
-@@ -173,7 +173,7 @@
- char *file_get_content_type( file_t *f )
- {
- 	if (f == NULL)
--		return;
-+		return NULL;
- 	
- 	switch (f->m_type)
- 	{
-@@ -182,6 +182,7 @@
- 	case FILE_TYPE_HTTP:
- 		return fhttp_get_content_type(f);
- 	}
-+    return NULL;
- } /* End of 'file_get_content_type' function */
- 
- /* Write line to file */
-@@ -203,7 +204,7 @@
- char *file_gets( char *s, int size, file_t *f )
- {
- 	if (f == NULL)
--		return;
-+		return NULL;
- 	
- 	switch (f->m_type)
- 	{
-@@ -219,7 +220,7 @@
- bool_t file_eof( file_t *f )
- {
- 	if (f == NULL)
--		return;
-+		return NULL;
- 	
- 	switch (f->m_type)
- 	{
-@@ -235,7 +236,7 @@
- str_t *file_get_str( file_t *f )
- {
- 	if (f == NULL)
--		return;
-+		return NULL;
- 	
- 	switch (f->m_type)
- 	{
---- libmpfc/util.c.orig	2011-03-13 00:17:19.000000000 +0100
-+++ libmpfc/util.c	2011-03-13 00:17:46.000000000 +0100
-@@ -136,6 +136,7 @@
- 			outj ++ = '\\';
- 		outj ++ = in_namei;
- 	}
-+    return out;
- } /* End of 'util_escape_fname' function */
- 
- /* Open a file expanding home directories */
---- libmpfc/plugin_input.c.orig	2011-03-12 21:15:07.000000000 +0100
-+++ libmpfc/plugin_input.c	2011-03-13 00:15:59.000000000 +0100
-@@ -253,7 +253,7 @@
- str_t *inp_set_song_title( in_plugin_t *p, char *filename )
- {
- 	if (filename == NULL)
--		return;
-+		return NULL;
- 	
- 	if (p != NULL && p->m_pd.m_set_song_title != NULL)
- 		return p->m_pd.m_set_song_title(filename);

mpfc-fix_missing_std_headers.patch Added

mpfc-getaddrinfo.patch Added

@@ -0,0 +1,221 @@
+--- plugins/input/audiocd/cddb.c.orig	2011-03-13 21:10:31.000000000 +0100
++++ plugins/input/audiocd/cddb.c	2011-03-13 21:36:20.000000000 +0100
+@@ -39,7 +39,7 @@
+ #define CDDB_MAX_LINE_LEN 256
+ 
+ #define CDDB_BUF_SIZE 65536
+-#define CDDB_PORT 8880
++#define CDDB_PORT "8880"
+ 
+ /* Data */
+ static char **cddb_data = NULL;
+@@ -201,10 +201,11 @@
+ {
+ 	int sockfd = -1, i;
+ 	char bufCDDB_BUF_SIZE;
+-	struct hostent *he;
+-	struct sockaddr_in their_addr;
+ 	char hostMAX_FILE_NAME;
+ 	char category80;
++    struct addrinfo hints;
++    struct addrinfo *result, *rp;
++    int s;
+ 
+ 	if (!cddb_server_found)
+ 		return FALSE;
+@@ -213,23 +214,35 @@
+ 	cddb_get_host_name(host);
+ 
+ 	/* Get host address */
++    memset(&hints, 0, sizeof(struct addrinfo));
++    hints.ai_family = AF_UNSPEC;
++    hints.ai_socktype = SOCK_STREAM;
++    hints.ai_flags = 0;
++    hints.ai_protocol = 0;
+ 	logger_message(acd_log, 1, _("Getting address of %s"), host);
+-	he = gethostbyname(host);
+-	if (he == NULL)
+-		goto close;
+-
+-	/* Initialize socket and connect */
+-	logger_message(acd_log, 1, _("Connecting to %s"), host);
+-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+-	if (sockfd < 0)
+-		goto close;
+-	their_addr.sin_family = AF_INET;
+-	their_addr.sin_port = htons(CDDB_PORT);
+-	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
+-	memset(&(their_addr.sin_zero), 0, 8);
+-	if (connect(sockfd, (struct sockaddr *)&their_addr, 
+-				sizeof(struct sockaddr)) < 0)
+-		goto close;
++    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
++    if (s != 0)
++    {
++	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
++        goto close;
++    }
++    for (rp = result; rp != NULL; rp = rp->ai_next)
++    {
++        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
++        if (sockfd < 0)
++            continue;
++	    logger_message(acd_log, 1, _("Connecting to %s"), host);
++        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
++            break;
++        close(sockfd);
++    }
++    if (rp == NULL)
++    {
++        freeaddrinfo(result);
++	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
++        goto close;
++    }
++    logger_message(acd_log, 1, _("Connected to %s"), host);
+ 
+ 	/* Communicate with server */
+ 	logger_message(acd_log, 1, _("Sending query to server"));
+@@ -548,12 +561,13 @@
+ void cddb_submit( char *filename )
+ {	
+ 	char *email, *category;
+-	int sockfd = -1, i;
++	int sockfd = -1;
+ 	char bufCDDB_BUF_SIZE;
+-	struct hostent *he;
+-	struct sockaddr_in their_addr;
+ 	char hostMAX_FILE_NAME;
+ 	char *post_str;
++    struct addrinfo hints;
++    struct addrinfo *result, *rp;
++    int s;
+ 	
+ 	/* Check data */
+ 	if (cddb_data == NULL)
+@@ -584,22 +598,29 @@
+ 
+ 	/* Get host address */
+ 	logger_message(acd_log, 1, _("Getting address of %s"), host);
+-	he = gethostbyname(host);
+-	if (he == NULL)
+-		goto close;
+-
+-	/* Initialize socket and connect */
+-	logger_message(acd_log, 1, _("Connecting to %s"), host);
+-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+-	if (sockfd < 0)
+-		goto close;
+-	their_addr.sin_family = AF_INET;
+-	their_addr.sin_port = htons(CDDB_PORT);
+-	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
+-	memset(&(their_addr.sin_zero), 0, 8);
+-	if (connect(sockfd, (struct sockaddr *)&their_addr, 
+-				sizeof(struct sockaddr)) < 0)
+-		goto close;
++    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
++    if (s != 0)
++    {
++	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
++        goto close;
++    }
++    for (rp = result; rp != NULL; rp = rp->ai_next)
++    {
++        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
++        if (sockfd < 0)
++            continue;
++	    logger_message(acd_log, 1, _("Connecting to %s"), host);
++        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
++            break;
++        close(sockfd);
++    }
++    if (rp == NULL)
++    {
++        freeaddrinfo(result);
++	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
++        goto close;
++    }
++    logger_message(acd_log, 1, _("Connected to %s"), host);
+ 
+ 	/* Communicate with server */
+ 	logger_message(acd_log, 1, _("Posting data to server"));
+--- libmpfc/file_http.c.orig	2011-03-13 21:21:09.000000000 +0100
++++ libmpfc/file_http.c	2011-03-13 21:33:29.000000000 +0100
+@@ -43,16 +43,17 @@
+ /* Open a file */
+ file_t *fhttp_open( file_t *f, char *mode )
+ {
+-	int i;
+ 	file_http_data_t *data;
+-	struct hostent *he;
+-	struct sockaddr_in their_addr;
+ 	char str1024;
+ 	char *header = NULL, *ph = NULL;
+ 	int n, end, hs, code;
+ 	char *name, *host_name, *file_name;
+ 	int port;
+ 	int read_size;
++    struct addrinfo hints;
++    struct addrinfo *result, *rp;
++    int s;
++    char portstr16;
+ 
+ 	/* Allocate memory for additional data */
+ 	f->m_data = (void *)malloc(sizeof(*data));
+@@ -76,28 +77,37 @@
+ 	{
+ 		/* Parse URL */
+ 		fhttp_parse_url(name, &host_name, &file_name, &port);
++        snprintf(portstr, 16, "%d", port);
+ 
+-		/* Get host address */
++        /* Get host address */
++        memset(&hints, 0, sizeof(struct addrinfo));
++        hints.ai_family = AF_UNSPEC;
++        hints.ai_socktype = SOCK_STREAM;
++        hints.ai_flags = 0;
++        hints.ai_protocol = 0;
+ 		logger_message(f->m_log, 1, _("Getting address of host %s"), host_name);
+-		he = gethostbyname(host_name);
+-		if (he == NULL)
+-		{
+-			goto close;
+-		}
+-		logger_message(f->m_log, 1, _("OK"));
+-
+-		/* Initialize socket and connect */
+-		data->m_sock = socket(AF_INET, SOCK_STREAM, 0);
+-		if (data->m_sock < 0)
+-			goto close;
+-		their_addr.sin_family = AF_INET;
+-		their_addr.sin_port = htons(port);
+-		their_addr.sin_addr = *((struct in_addr *)he->h_addr);
+-		memset(&(their_addr.sin_zero), 0, 8);
+-		logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
+-		if (connect(data->m_sock, (struct sockaddr *)&their_addr, 
+-					sizeof(struct sockaddr)) < 0)
+-			goto close;
++        s = getaddrinfo(host_name, portstr, &hints, &result);
++        if (s != 0)
++        {
++            logger_error(f->m_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host_name, gai_strerror(s));
++            goto close;
++        }
++        for (rp = result; rp != NULL; rp = rp->ai_next)
++        {
++            data->m_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
++            if (data->m_sock < 0)
++                continue;
++            logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
++            if (connect(data->m_sock, rp->ai_addr, rp->ai_addrlen) >= 0)
++                break;
++            close(data->m_sock);
++        }
++        if (rp == NULL)
++        {
++            freeaddrinfo(result);
++            logger_error(f->m_log, 1, _("Failed to connect to %s"), host_name);
++            goto close;
++        }
+ 		logger_message(f->m_log, 1, _("OK"));
+ 
+ 		/* Send request for file we need */

mpfc-1.3.8.tar.bz2/AUTHORS -> mpfc-1.3.8.1.tar.bz2/AUTHORS Changed

mpfc-1.3.8.tar.bz2/ChangeLog -> mpfc-1.3.8.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,47 @@
+2011-03-13 12:16  sg2
+
+	* libmpfc/id3.c, plugins/input/audiocd/cddb.c,
+	  plugins/input/cue/cue_sheet.c,
+	  plugins/output/disk_writer/writer.c, plugins/output/oss/oss.c,
+	  src/eqwnd.c, src/player.c: warn_unused_result warnings fixed.
+
+2011-03-13 11:58  sg2
+
+	* AUTHORS, libmpfc/Makefile.am, libmpfc/file.c, libmpfc/id3.c,
+	  libmpfc/plugin_input.c, libmpfc/util.c, libmpfc/vfs.c,
+	  libmpfcwnd/Makefile.am, libmpfcwnd/wnd_checkbox.c,
+	  libmpfcwnd/wnd_def_handlers.c, libmpfcwnd/wnd_editbox.c,
+	  libmpfcwnd/wnd_label.c, libmpfcwnd/wnd_listbox.c,
+	  libmpfcwnd/wnd_radio.c, libmpfcwnd/wnd_root.c, mpfc.pc.in,
+	  plugins/input/audiocd/Makefile.am,
+	  plugins/input/audiocd/audiocd.c, plugins/input/cue/Makefile.am,
+	  plugins/input/cue/cue.c, plugins/input/flac/Makefile.am,
+	  plugins/input/mp3/Makefile.am, plugins/input/ogg/Makefile.am,
+	  plugins/input/ogg/ogg.c, plugins/input/wav/Makefile.am,
+	  plugins/output/alsa/Makefile.am,
+	  plugins/output/disk_writer/Makefile.am,
+	  plugins/output/disk_writer/writer.c,
+	  plugins/output/oss/Makefile.am, plugins/output/oss/oss.c,
+	  src/browser.c, src/player.c, src/plist.c: Some patches by Pascal
+	  Bleser to fix build process and a possible buffer oveflow in m3u
+	  parsing.
+
+2011-03-12 21:46  sg2
+
+	* Makefile.am: Added m4 to dist.
+
+2011-03-12 19:47  sg2
+
+	* Makefile.am: EXTRA_DIST fix.
+
+2011-03-12 19:37  sg2
+
+	* ChangeLog: ChangeLog updated.
+
+2011-03-12 19:35  sg2
+
+	* configure.ac: Version update.
+
 2011-03-12 19:18  sg2
 
 	* .: MPFC 1.3.8 release.

mpfc-1.3.8.tar.bz2/configure -> mpfc-1.3.8.1.tar.bz2/configure Changed

mpfc-1.3.8.tar.bz2/configure.ac -> mpfc-1.3.8.1.tar.bz2/configure.ac Changed

mpfc-1.3.8.tar.bz2/libmpfc/Makefile.am -> mpfc-1.3.8.1.tar.bz2/libmpfc/Makefile.am Changed

mpfc-1.3.8.tar.bz2/libmpfc/Makefile.in -> mpfc-1.3.8.1.tar.bz2/libmpfc/Makefile.in Changed

mpfc-1.3.8.tar.bz2/libmpfc/file.c -> mpfc-1.3.8.1.tar.bz2/libmpfc/file.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. File library functions implementation.
- * $Id: file.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id: file.c 307 2011-03-13 11:58:47Z sg2 $
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -173,7 +173,7 @@
 char *file_get_content_type( file_t *f )
 {
 	if (f == NULL)
-		return;
+		return NULL;
 	
 	switch (f->m_type)
 	{
@@ -182,6 +182,7 @@
 	case FILE_TYPE_HTTP:
 		return fhttp_get_content_type(f);
 	}
+    return NULL;
 } /* End of 'file_get_content_type' function */
 
 /* Write line to file */
@@ -203,7 +204,7 @@
 char *file_gets( char *s, int size, file_t *f )
 {
 	if (f == NULL)
-		return;
+		return NULL;
 	
 	switch (f->m_type)
 	{
@@ -219,7 +220,7 @@
 bool_t file_eof( file_t *f )
 {
 	if (f == NULL)
-		return;
+		return FALSE;
 	
 	switch (f->m_type)
 	{
@@ -235,7 +236,7 @@
 str_t *file_get_str( file_t *f )
 {
 	if (f == NULL)
-		return;
+		return NULL;
 	
 	switch (f->m_type)
 	{

mpfc-1.3.8.tar.bz2/libmpfc/id3.c -> mpfc-1.3.8.1.tar.bz2/libmpfc/id3.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. ID3 tags handling library functions implementation.
- * $Id: id3.c 276 2009-08-08 18:41:54Z sg2 $
+ * $Id: id3.c 308 2011-03-13 12:16:29Z sg2 $
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -112,7 +112,7 @@
 	bool_t ret1, ret2;
 
 	if (tag == NULL || filename == NULL)
-		return;
+		return FALSE;
 
 	/* Write tags */
 	ret1 = id3_v1_write(&tag->m_v1, filename);
@@ -271,14 +271,22 @@
 
 	/* Determine if there exists tag */
 	fseek(fd, -ID3_V1_TOTAL_SIZE, SEEK_END);
-	fread(magic, 1, 3, fd);
+	if (fread(magic, 1, 3, fd) != 3)
+	{
+		fclose(fd);
+		return FALSE;
+	}
 	if (strncmp(magic, "TAG", 3))
 		fseek(fd, 0, SEEK_END);
 	else
 		fseek(fd, -3, SEEK_CUR);
 
 	/* Write tag */
-	fwrite(tag->m_stream, 1, ID3_V1_TOTAL_SIZE, fd);
+	if (fwrite(tag->m_stream, 1, ID3_V1_TOTAL_SIZE, fd) != ID3_V1_TOTAL_SIZE)
+	{
+		fclose(fd);
+		return FALSE;
+	}
 
 	/* Close file */
 	fclose(fd);
@@ -301,15 +309,22 @@
 		return FALSE;
 
 	/* Get information about current tag */
-	fread(magic, 1, 3, fd);
+	if (fread(magic, 1, 3, fd) != 3)
+	{
+		fclose(fd);
+		return FALSE;
+	}
 	prev_size = 0;
 	if (magic0 == 'I' && magic1 == 'D' && magic2 == '3')
 	{
 		byte s4;
 		byte f;
 		fseek(fd, 5, SEEK_SET);
-		fread(&f, 1, 1, fd);
-		fread(&s, 1, 4, fd);
+		if (fread(&f, 1, 1, fd) != 1 || fread(&s, 1, 4, fd) != 4)
+		{
+			fclose(fd);
+			return FALSE;
+		}
 		prev_size = s3 | (s2 << 7) | (s1 << 14) | (s0 << 21);
 		prev_size += 10;
 		if (f & 16)
@@ -323,12 +338,17 @@
 	if (data == NULL)
 	{
 		fclose(fd);
-		return;
+		return FALSE;
 	}
 
 	/* Fill data */
 	fseek(fd, prev_size, SEEK_SET);
-	fread(&datasize, 1, file_size, fd);
+	if (fread(&datasize, 1, file_size, fd) != file_size)
+	{
+		fclose(fd);
+		free(data);
+		return FALSE;
+	}
 	memcpy(data, tag->m_stream, size);
 	fclose(fd);
 
@@ -337,9 +357,14 @@
 	if (fd == NULL)
 	{
 		free(data);
-		return;
+		return FALSE;
+	}
+	if (fwrite(data, 1, file_size + size, fd) != file_size + size)
+	{
+		fclose(fd);
+		free(data);
+		return FALSE;
 	}
-	fwrite(data, 1, file_size + size, fd);
 	fclose(fd);
 	free(data);
 	return TRUE;
@@ -724,7 +749,11 @@
 		return;
 	}
 	fseek(fd, 0, SEEK_SET);
-	fread(buf, 1, file_size, fd);
+	if (fread(buf, 1, file_size, fd) != file_size)
+	{
+		fclose(fd);
+		return;
+	}
 	fclose(fd);
 
 	/* Find and remove ID3V2 */
@@ -759,7 +788,13 @@
 		free(buf);
 		return;
 	}
-	fwrite(buf, 1, file_size, fd);
+	if (fwrite(buf, 1, file_size, fd) != file_size)
+	{
+		fclose(fd);
+		free(buf);
+		return;
+	}
+
 	fclose(fd);
 	free(buf);
 } /* End of 'id3_remove' function */

mpfc-1.3.8.tar.bz2/libmpfc/plugin_input.c -> mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_input.c Changed

mpfc-1.3.8.tar.bz2/libmpfc/util.c -> mpfc-1.3.8.1.tar.bz2/libmpfc/util.c Changed

mpfc-1.3.8.tar.bz2/libmpfc/vfs.c -> mpfc-1.3.8.1.tar.bz2/libmpfc/vfs.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/Makefile.am -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/Makefile.am Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/Makefile.in -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/Makefile.in Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_checkbox.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_checkbox.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_def_handlers.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_def_handlers.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_editbox.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_editbox.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_label.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_label.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_listbox.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_listbox.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_radio.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_radio.c Changed

mpfc-1.3.8.tar.bz2/libmpfcwnd/wnd_root.c -> mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_root.c Changed

mpfc-1.3.8.tar.bz2/mpfc-config.h -> mpfc-1.3.8.1.tar.bz2/mpfc-config.h Changed

mpfc-1.3.8.tar.bz2/mpfc.pc.in -> mpfc-1.3.8.1.tar.bz2/mpfc.pc.in Changed

mpfc-1.3.8.tar.bz2/plugins/input/audiocd/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/audiocd/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libaudiocd_la_DEPENDENCIES =
 am_libaudiocd_la_OBJECTS = audiocd.lo cddb.lo
 libaudiocd_la_OBJECTS = $(am_libaudiocd_la_OBJECTS)
@@ -248,7 +248,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -267,7 +267,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libaudiocd.la
+mylib_LTLIBRARIES = libaudiocd.la
+mylibdir = $(libdir)/mpfc/input
 libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
 libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
@@ -305,39 +306,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libaudiocd.la: $(libaudiocd_la_OBJECTS) $(libaudiocd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libaudiocd_la_OBJECTS) $(libaudiocd_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(mylibdir) $(libaudiocd_la_OBJECTS) $(libaudiocd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -461,7 +462,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -491,7 +492,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -512,13 +513,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -558,23 +559,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/input/audiocd/audiocd.c -> mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/audiocd.c Changed

mpfc-1.3.8.tar.bz2/plugins/input/audiocd/cddb.c -> mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/cddb.c Changed

mpfc-1.3.8.tar.bz2/plugins/input/cue/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/cue/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/cue/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/cue/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libcue_la_DEPENDENCIES =
 am_libcue_la_OBJECTS = cue.lo cue_sheet.lo
 libcue_la_OBJECTS = $(am_libcue_la_OBJECTS)
@@ -251,7 +251,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
@@ -270,7 +270,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libcue.la
+mylib_LTLIBRARIES = libcue.la
+mylibdir = $(libdir)/mpfc/input
 libcue_la_SOURCES = cue.c cue_sheet.c cue_sheet.h
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
 libcue_la_LDFLAGS = -Xcompiler -nostartfiles 
@@ -309,39 +310,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcue.la: $(libcue_la_OBJECTS) $(libcue_la_DEPENDENCIES) 
-	$(libcue_la_LINK) -rpath $(libdir) $(libcue_la_OBJECTS) $(libcue_la_LIBADD) $(LIBS)
+	$(libcue_la_LINK) -rpath $(mylibdir) $(libcue_la_OBJECTS) $(libcue_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -465,7 +466,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -495,7 +496,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -516,13 +517,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -562,23 +563,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/input/cue/cue.c -> mpfc-1.3.8.1.tar.bz2/plugins/input/cue/cue.c Changed

mpfc-1.3.8.tar.bz2/plugins/input/cue/cue_sheet.c -> mpfc-1.3.8.1.tar.bz2/plugins/input/cue/cue_sheet.c Changed

mpfc-1.3.8.tar.bz2/plugins/input/flac/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/flac/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/flac/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/flac/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libflac_la_DEPENDENCIES =
 am_libflac_la_OBJECTS = flac.lo
 libflac_la_OBJECTS = $(am_libflac_la_OBJECTS)
@@ -251,7 +251,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
@@ -270,7 +270,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libflac.la
+mylib_LTLIBRARIES = libflac.la
+mylibdir = $(libdir)/mpfc/input
 libflac_la_SOURCES = flac.c
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
 libflac_la_LDFLAGS = -Xcompiler -nostartfiles 
@@ -309,39 +310,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libflac.la: $(libflac_la_OBJECTS) $(libflac_la_DEPENDENCIES) 
-	$(libflac_la_LINK) -rpath $(libdir) $(libflac_la_OBJECTS) $(libflac_la_LIBADD) $(LIBS)
+	$(libflac_la_LINK) -rpath $(mylibdir) $(libflac_la_OBJECTS) $(libflac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -464,7 +465,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -494,7 +495,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -515,13 +516,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -561,23 +562,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/input/mp3/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/mp3/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libmp3_la_DEPENDENCIES =
 am_libmp3_la_OBJECTS = mp3.lo
 libmp3_la_OBJECTS = $(am_libmp3_la_OBJECTS)
@@ -251,7 +251,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
@@ -270,7 +270,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libmp3.la
+mylib_LTLIBRARIES = libmp3.la
+mylibdir = $(libdir)/mpfc/input
 libmp3_la_SOURCES = mp3.c mp3.h 
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
 libmp3_la_LDFLAGS = -Xcompiler -nostartfiles 
@@ -309,39 +310,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libmp3.la: $(libmp3_la_OBJECTS) $(libmp3_la_DEPENDENCIES) 
-	$(libmp3_la_LINK) -rpath $(libdir) $(libmp3_la_OBJECTS) $(libmp3_la_LIBADD) $(LIBS)
+	$(libmp3_la_LINK) -rpath $(mylibdir) $(libmp3_la_OBJECTS) $(libmp3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -464,7 +465,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -494,7 +495,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -515,13 +516,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -561,23 +562,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/input/ogg/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/ogg/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libogg_vorbis_la_DEPENDENCIES =
 am_libogg_vorbis_la_OBJECTS = ogg.lo vcedit.lo
 libogg_vorbis_la_OBJECTS = $(am_libogg_vorbis_la_OBJECTS)
@@ -251,7 +251,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -270,7 +270,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libogg_vorbis.la
+mylib_LTLIBRARIES = libogg_vorbis.la
+mylibdir = $(libdir)/mpfc/input
 libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
 libogg_vorbis_la_LDFLAGS = -Xcompiler -nostartfiles
@@ -309,39 +310,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libogg_vorbis.la: $(libogg_vorbis_la_OBJECTS) $(libogg_vorbis_la_DEPENDENCIES) 
-	$(libogg_vorbis_la_LINK) -rpath $(libdir) $(libogg_vorbis_la_OBJECTS) $(libogg_vorbis_la_LIBADD) $(LIBS)
+	$(libogg_vorbis_la_LINK) -rpath $(mylibdir) $(libogg_vorbis_la_OBJECTS) $(libogg_vorbis_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -465,7 +466,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -495,7 +496,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -516,13 +517,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -562,23 +563,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/input/ogg/ogg.c -> mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/ogg.c Changed

mpfc-1.3.8.tar.bz2/plugins/input/wav/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/input/wav/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/input/wav/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/input/wav/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libwav_la_DEPENDENCIES =
 am_libwav_la_OBJECTS = wav.lo
 libwav_la_OBJECTS = $(am_libwav_la_OBJECTS)
@@ -248,7 +248,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/input
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -267,7 +267,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libwav.la
+mylib_LTLIBRARIES = libwav.la
+mylibdir = $(libdir)/mpfc/input
 libwav_la_SOURCES = wav.c wav.h
 libwav_la_LIBADD = @COMMON_LIBS@
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
@@ -305,39 +306,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libwav.la: $(libwav_la_OBJECTS) $(libwav_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libwav_la_OBJECTS) $(libwav_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(mylibdir) $(libwav_la_OBJECTS) $(libwav_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,7 +461,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -490,7 +491,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -511,13 +512,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -557,23 +558,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/output/alsa/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/output/alsa/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/output/alsa/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/output/alsa/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libalsa_la_DEPENDENCIES =
 am_libalsa_la_OBJECTS = alsa.lo
 libalsa_la_OBJECTS = $(am_libalsa_la_OBJECTS)
@@ -248,7 +248,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/output
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
@@ -267,7 +267,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libalsa.la
+mylib_LTLIBRARIES = libalsa.la
+mylibdir = $(libdir)/mpfc/output
 libalsa_la_SOURCES = alsa.c
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
 libalsa_la_LIBADD = @COMMON_LIBS@ @ASOUND_LIBS@
@@ -305,39 +306,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libalsa.la: $(libalsa_la_OBJECTS) $(libalsa_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libalsa_la_OBJECTS) $(libalsa_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(mylibdir) $(libalsa_la_OBJECTS) $(libalsa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,7 +461,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -490,7 +491,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -511,13 +512,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -557,23 +558,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/output/disk_writer/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/output/disk_writer/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 libdisk_writer_la_DEPENDENCIES =
 am_libdisk_writer_la_OBJECTS = writer.lo
 libdisk_writer_la_OBJECTS = $(am_libdisk_writer_la_OBJECTS)
@@ -248,7 +248,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/output
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -267,7 +267,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libdisk_writer.la
+mylib_LTLIBRARIES = libdisk_writer.la
+mylibdir = $(libdir)/mpfc/output
 libdisk_writer_la_SOURCES = writer.c
 libdisk_writer_la_LIBADD = @COMMON_LIBS@
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
@@ -305,39 +306,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libdisk_writer.la: $(libdisk_writer_la_OBJECTS) $(libdisk_writer_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libdisk_writer_la_OBJECTS) $(libdisk_writer_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(mylibdir) $(libdisk_writer_la_OBJECTS) $(libdisk_writer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,7 +461,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -490,7 +491,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -511,13 +512,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -557,23 +558,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/output/disk_writer/writer.c -> mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/writer.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Disk writer output plugin functions implementation.
- * $Id: writer.c 297 2011-01-04 19:18:44Z sg2 $
+ * $Id: writer.c 308 2011-03-13 12:16:29Z sg2 $
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -20,6 +20,8 @@
  * MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/soundcard.h>
@@ -31,6 +33,8 @@
 #include "wnd_dialog.h"
 #include "wnd_checkbox.h"
 #include "wnd_editbox.h"
+#include "wnd_filebox.h"
+#include "util.h"
 
 /* Header size */
 #define DW_HEAD_SIZE 44
@@ -310,7 +314,10 @@
 				snprintf(cmd, sizeof(cmd), "oggenc -Q \"%s\"", full_name);
 			}
 			logger_status_msg(dw_log, 1, _("Encoding: %s"), cmd);
-			system(cmd);
+			if (system(cmd) < 0)
+			{
+				logger_error(dw_log, 1, _("Encoder command failed"));
+			}
 			unlink(full_name);
 			dw_head_fragment ++;
 		}

mpfc-1.3.8.tar.bz2/plugins/output/oss/Makefile.am -> mpfc-1.3.8.1.tar.bz2/plugins/output/oss/Makefile.am Changed

mpfc-1.3.8.tar.bz2/plugins/output/oss/Makefile.in -> mpfc-1.3.8.1.tar.bz2/plugins/output/oss/Makefile.in Changed

@@ -65,8 +65,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
 liboss_la_DEPENDENCIES =
 am_liboss_la_OBJECTS = oss.lo
 liboss_la_OBJECTS = $(am_liboss_la_OBJECTS)
@@ -248,7 +248,7 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/mpfc/output
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -267,7 +267,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = liboss.la
+mylib_LTLIBRARIES = liboss.la
+mylibdir = $(libdir)/mpfc/output
 liboss_la_SOURCES = oss.c
 liboss_la_LIBADD = @COMMON_LIBS@
 INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
@@ -305,39 +306,39 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
 	}
 
-uninstall-libLTLIBRARIES:
+uninstall-mylibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 liboss.la: $(liboss_la_OBJECTS) $(liboss_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(liboss_la_OBJECTS) $(liboss_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(mylibdir) $(liboss_la_OBJECTS) $(liboss_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,7 +461,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -490,7 +491,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -511,13 +512,13 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-mylibLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -557,23 +558,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-mylibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	install-html-am install-info install-info-am install-man \
+	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-mylibLTLIBRARIES
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.tar.bz2/plugins/output/oss/oss.c -> mpfc-1.3.8.1.tar.bz2/plugins/output/oss/oss.c Changed

mpfc-1.3.8.tar.bz2/po/mpfc.pot -> mpfc-1.3.8.1.tar.bz2/po/mpfc.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-12 23:18+0300\n"
+"POT-Creation-Date: 2011-03-13 15:17+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,8 +28,8 @@
 msgid "OK"
 msgstr ""
 
-#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:221
-#: plugins/input/audiocd/cddb.c:591
+#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:222
+#: plugins/input/audiocd/cddb.c:592
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
@@ -62,12 +62,12 @@
 msgid "Plugin %s has no 'plugin_exchange_data'"
 msgstr ""
 
-#: libmpfc/vfs.c:142 libmpfc/vfs.c:245
+#: libmpfc/vfs.c:143 libmpfc/vfs.c:246
 #, c-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: libmpfc/vfs.c:214
+#: libmpfc/vfs.c:215
 #, c-format
 msgid "Unable to stat file %s"
 msgstr ""
@@ -80,89 +80,89 @@
 msgid "Cancel"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:564
+#: plugins/input/audiocd/audiocd.c:565
 msgid "Configure AudioCD plugin"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:565
+#: plugins/input/audiocd/audiocd.c:566
 msgid "CD &device: "
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:567
+#: plugins/input/audiocd/audiocd.c:568
 msgid "Use di&gital mode"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:569
+#: plugins/input/audiocd/audiocd.c:570
 msgid "CDDB parameters"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:570
+#: plugins/input/audiocd/audiocd.c:571
 msgid "&Host: "
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:572
+#: plugins/input/audiocd/audiocd.c:573
 msgid "&Email: "
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:574
+#: plugins/input/audiocd/audiocd.c:575
 msgid "Disc c&ategory: "
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:629
+#: plugins/input/audiocd/audiocd.c:630
 msgid "Reload info from CDDB"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:632
+#: plugins/input/audiocd/audiocd.c:633
 msgid "Submit info to CDDB"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:215 plugins/input/audiocd/cddb.c:585
+#: plugins/input/audiocd/cddb.c:216 plugins/input/audiocd/cddb.c:586
 #, c-format
 msgid "Getting address of %s"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:234
+#: plugins/input/audiocd/cddb.c:235
 msgid "Sending query to server"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:268
+#: plugins/input/audiocd/cddb.c:269
 msgid "Saving data"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:270
+#: plugins/input/audiocd/cddb.c:271
 msgid "Success"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:273
+#: plugins/input/audiocd/cddb.c:274
 msgid "Failed!"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:379 plugins/input/ogg/ogg.c:346
+#: plugins/input/audiocd/cddb.c:380 plugins/input/ogg/ogg.c:347
 #, c-format
 msgid "Unable to open file %s for writing"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:561
+#: plugins/input/audiocd/cddb.c:562
 msgid "CDDB submit error: no existing info found"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:570
+#: plugins/input/audiocd/cddb.c:571
 msgid "CDDB submit error: you must specify your email address"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:577
+#: plugins/input/audiocd/cddb.c:578
 msgid "CDDB submit error: you must specify your category"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:604
+#: plugins/input/audiocd/cddb.c:605
 msgid "Posting data to server"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:615
+#: plugins/input/audiocd/cddb.c:616
 msgid "Getting response"
 msgstr ""
 
-#: plugins/input/audiocd/cddb.c:623
+#: plugins/input/audiocd/cddb.c:624
 msgid "Failure!"
 msgstr ""
 
@@ -264,16 +264,16 @@
 msgid "Remove ID3 tags"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:280
+#: plugins/input/ogg/ogg.c:281
 msgid "Only regular files are supported forwriting info by ogg plugin"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:307 src/plist.c:270
+#: plugins/input/ogg/ogg.c:308 src/plist.c:273
 #, c-format
 msgid "Unable to open file %s"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:378
+#: plugins/input/ogg/ogg.c:379
 #, c-format
 msgid ""
 "Nominal bitrate: %li kb/s\n"
@@ -281,7 +281,7 @@
 "Channels: %i"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:419
+#: plugins/input/ogg/ogg.c:420
 #, c-format
 msgid ""
 "Nominal bitrate: %li kb/s\n"
@@ -291,11 +291,11 @@
 "File size: %i bytes"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:449
+#: plugins/input/ogg/ogg.c:450
 msgid "Configure OggVorbis plugin"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:451
+#: plugins/input/ogg/ogg.c:452
 msgid "Always use &UTF-8"
 msgstr ""
 
@@ -353,45 +353,49 @@
 msgid "Configure ALSA plugin"
 msgstr ""
 
-#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:177
+#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:181
 msgid "&Device: "
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:89
+#: plugins/output/disk_writer/writer.c:93
 #, c-format
 msgid "Unable to create file %s"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:312
+#: plugins/output/disk_writer/writer.c:316
 #, c-format
 msgid "Encoding: %s"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:350
+#: plugins/output/disk_writer/writer.c:319
+msgid "Encoder command failed"
+msgstr ""
+
+#: plugins/output/disk_writer/writer.c:357
 msgid "Configure disk writer plugin"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:351
+#: plugins/output/disk_writer/writer.c:358
 msgid "P&ath to store: "
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:353
+#: plugins/output/disk_writer/writer.c:360
 msgid "Encoder"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:354
+#: plugins/output/disk_writer/writer.c:361
 msgid "&Enable encoder"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:356
+#: plugins/output/disk_writer/writer.c:363
 msgid "F&ragment size: "
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:358
+#: plugins/output/disk_writer/writer.c:365
 msgid "Encoder c&ommand: "
 msgstr ""
 
-#: plugins/output/oss/oss.c:176
+#: plugins/output/oss/oss.c:180
 msgid "Configure OSS plugin"
 msgstr ""
 
@@ -408,55 +412,55 @@
 msgid "Enter name you want to search: "
 msgstr ""
 
-#: src/browser.c:622
+#: src/browser.c:623
 msgid "Select files matching pattern"
 msgstr ""
 
-#: src/browser.c:623
+#: src/browser.c:624
 msgid "Deselect files matching pattern"
 msgstr ""
 
-#: src/browser.c:625
+#: src/browser.c:626
 msgid "P&attern: "
 msgstr ""
 
-#: src/browser.c:790
+#: src/browser.c:791
 msgid "File name"
 msgstr ""
 
-#: src/browser.c:796
+#: src/browser.c:797
 msgid "Title"
 msgstr ""
 
-#: src/browser.c:802
+#: src/browser.c:803
 msgid "Artist"
 msgstr ""
 
-#: src/browser.c:808
+#: src/browser.c:809
 msgid "Album"
 msgstr ""
 
-#: src/browser.c:814
+#: src/browser.c:815
 msgid "Year"
 msgstr ""
 
-#: src/browser.c:820
+#: src/browser.c:821
 msgid "Genre"
 msgstr ""
 
-#: src/browser.c:826
+#: src/browser.c:827
 msgid "Track"
 msgstr ""
 
-#: src/browser.c:832
+#: src/browser.c:833
 msgid "Time"
 msgstr ""
 
-#: src/browser.c:948
+#: src/browser.c:949
 msgid "Change directory"
 msgstr ""
 
-#: src/browser.c:949
+#: src/browser.c:950
 msgid "&Directory: "
 msgstr ""
 
@@ -468,7 +472,7 @@
 msgid "Load preset from a Winamp EQF file"
 msgstr ""
 
-#: src/eqwnd.c:215 src/player.c:2172 src/player.c:2418
+#: src/eqwnd.c:215 src/player.c:2174 src/player.c:2420
 msgid "&Name: "
 msgstr ""
 
@@ -843,7 +847,7 @@
 "%s"
 msgstr ""
 
-#: src/player.c:220 src/plist.c:302
+#: src/player.c:220 src/plist.c:305
 msgid "No enough memory"
 msgstr ""
 
@@ -855,361 +859,369 @@
 msgid "Unable to initialize play list window"
 msgstr ""
 
-#: src/player.c:266
+#: src/player.c:268
 msgid "Unable to initialize plugin manager"
 msgstr ""
 
-#: src/player.c:277
+#: src/player.c:279
 msgid "Unable to initialize VFS module"
 msgstr ""
 
-#: src/player.c:286
+#: src/player.c:288
 msgid "Unable to initialize info read/write thread"
 msgstr ""
 
-#: src/player.c:295
+#: src/player.c:297
 msgid "Unable to initialize undo list"
 msgstr ""
 
-#: src/player.c:303
+#: src/player.c:305
 msgid "Play list initialization failed"
 msgstr ""
 
-#: src/player.c:314
+#: src/player.c:316
 msgid "Unable to initialize set of files for play list"
 msgstr ""
 
-#: src/player.c:336
+#: src/player.c:338
 msgid "Unable to initialize player thread"
 msgstr ""
 
-#: src/player.c:363
+#: src/player.c:365
 msgid "Player initialized"
 msgstr ""
 
-#: src/player.c:382
+#: src/player.c:384
 msgid "Play list"
 msgstr ""
 
-#: src/player.c:502
+#: src/player.c:504
 msgid "Left MPFC"
 msgstr ""
 
-#: src/player.c:945 src/player.c:2957 src/player.c:2998
+#: src/player.c:947 src/player.c:2967 src/player.c:3008
 #, c-format
 msgid "String `%s' not found"
 msgstr ""
 
-#: src/player.c:949 src/player.c:2961 src/player.c:3002
+#: src/player.c:951 src/player.c:2971 src/player.c:3012
 #, c-format
 msgid "String `%s' found at position %d"
 msgstr ""
 
-#: src/player.c:1341
+#: src/player.c:1343
 msgid "SG Software Media Player For Console"
 msgstr ""
 
-#: src/player.c:1344 src/player.c:1381
+#: src/player.c:1346 src/player.c:1383
 msgid "Shuffle"
 msgstr ""
 
-#: src/player.c:1345 src/player.c:1382
+#: src/player.c:1347 src/player.c:1384
 msgid "Loop"
 msgstr ""
 
-#: src/player.c:1365
+#: src/player.c:1367
 #, c-format
 msgid "version %s"
 msgstr ""
 
-#: src/player.c:1850
+#: src/player.c:1852
 #, c-format
 msgid "Input plugin for file %s failed"
 msgstr ""
 
-#: src/player.c:1877
+#: src/player.c:1879
 msgid "Output plugin initialization failed"
 msgstr ""
 
-#: src/player.c:2093
+#: src/player.c:2095
 msgid "Add songs"
 msgstr ""
 
-#: src/player.c:2094 src/player.c:2109
+#: src/player.c:2096 src/player.c:2111
 msgid "File &name: "
 msgstr ""
 
-#: src/player.c:2108
+#: src/player.c:2110
 msgid "Save play list"
 msgstr ""
 
-#: src/player.c:2122
+#: src/player.c:2124
 msgid "Execute external command"
 msgstr ""
 
-#: src/player.c:2123
+#: src/player.c:2125
 msgid "C&ommand: "
 msgstr ""
 
-#: src/player.c:2137
+#: src/player.c:2139
 msgid "Sort play list"
 msgstr ""
 
-#: src/player.c:2138
+#: src/player.c:2140
 msgid "Sort by"
 msgstr ""
 
-#: src/player.c:2139 src/player.c:2447
+#: src/player.c:2141 src/player.c:2449
 msgid "&Title"
 msgstr ""
 
-#: src/player.c:2140
+#: src/player.c:2142
 msgid "&File name"
 msgstr ""
 
-#: src/player.c:2141
+#: src/player.c:2143
 msgid "P&ath and file name"
 msgstr ""
 
-#: src/player.c:2142 src/player.c:2453
+#: src/player.c:2144 src/player.c:2455
 msgid "T&rack"
 msgstr ""
 
-#: src/player.c:2143
+#: src/player.c:2145
 msgid "&Only selected area"
 msgstr ""
 
-#: src/player.c:2174
+#: src/player.c:2176
 msgid "&Artist: "
 msgstr ""
 
-#: src/player.c:2176
+#: src/player.c:2178
 msgid "A&lbum: "
 msgstr ""
 
-#: src/player.c:2178
+#: src/player.c:2180
 msgid "&Year: "
 msgstr ""
 
-#: src/player.c:2180
+#: src/player.c:2182
 msgid "&Track No: "
 msgstr ""
 
-#: src/player.c:2182
+#: src/player.c:2184
 msgid "C&omments: "
 msgstr ""
 
-#: src/player.c:2184
+#: src/player.c:2186
 msgid "&Genre: "
 msgstr ""
 
-#: src/player.c:2187
+#: src/player.c:2189
 msgid "&Reload info"
 msgstr ""
 
-#: src/player.c:2250
+#: src/player.c:2252
 msgid "Write in&fo in all the selected songs"
 msgstr ""
 
-#: src/player.c:2401
+#: src/player.c:2403
 msgid "Search"
 msgstr ""
 
-#: src/player.c:2402 src/player.c:2443
+#: src/player.c:2404 src/player.c:2445
 msgid "S&tring: "
 msgstr ""
 
-#: src/player.c:2417
+#: src/player.c:2419
 msgid "Variables manager"
 msgstr ""
 
-#: src/player.c:2421
+#: src/player.c:2423
 msgid "&Value: "
 msgstr ""
 
-#: src/player.c:2424
+#: src/player.c:2426
 msgid "Vie&w current value"
 msgstr ""
 
-#: src/player.c:2426
+#: src/player.c:2428
 msgid "Operation"
 msgstr ""
 
-#: src/player.c:2427
+#: src/player.c:2429
 msgid "S&et"
 msgstr ""
 
-#: src/player.c:2428
+#: src/player.c:2430
 msgid "&Add"
 msgstr ""
 
-#: src/player.c:2429
+#: src/player.c:2431
 msgid "&Remove"
 msgstr ""
 
-#: src/player.c:2442
+#: src/player.c:2444
 msgid "Advanced search"
 msgstr ""
 
-#: src/player.c:2446
+#: src/player.c:2448
 msgid "Search in"
 msgstr ""
 
-#: src/player.c:2448
+#: src/player.c:2450
 msgid "&Name"
 msgstr ""
 
-#: src/player.c:2449
+#: src/player.c:2451
 msgid "&Artist"
 msgstr ""
 
-#: src/player.c:2450
+#: src/player.c:2452
 msgid "A&lbum"
 msgstr ""
 
-#: src/player.c:2451
+#: src/player.c:2453
 msgid "&Year"
 msgstr ""
 
-#: src/player.c:2452
+#: src/player.c:2454
 msgid "&Genre"
 msgstr ""
 
-#: src/player.c:2454
+#: src/player.c:2456
 msgid "C&omment"
 msgstr ""
 
-#: src/player.c:2468
+#: src/player.c:2470
 #, c-format
 msgid "Removed %d song"
 msgid_plural "Removed %d songs"
 msgstr0 ""
 msgstr1 ""
 
-#: src/player.c:2476
+#: src/player.c:2478
 msgid "Reload info"
 msgstr ""
 
-#: src/player.c:2477
+#: src/player.c:2479
 msgid "&Only in selected area"
 msgstr ""
 
-#: src/player.c:2490
+#: src/player.c:2492
 msgid "Run/stop test"
 msgstr ""
 
-#: src/player.c:2491
+#: src/player.c:2493
 msgid "Tests"
 msgstr ""
 
-#: src/player.c:2492
+#: src/player.c:2494
 msgid "Test &1. Window library perfomance"
 msgstr ""
 
-#: src/player.c:2494
+#: src/player.c:2496
 msgid "&Stop job"
 msgstr ""
 
-#: src/player.c:2537
+#: src/player.c:2539
 msgid "Input"
 msgstr ""
 
-#: src/player.c:2538
+#: src/player.c:2540
 msgid "&Input"
 msgstr ""
 
-#: src/player.c:2541
+#: src/player.c:2543
 msgid "Output"
 msgstr ""
 
-#: src/player.c:2542
+#: src/player.c:2544
 msgid "&Output"
 msgstr ""
 
-#: src/player.c:2545
+#: src/player.c:2547
 msgid "Effect"
 msgstr ""
 
-#: src/player.c:2546
+#: src/player.c:2548
 msgid "&Effect"
 msgstr ""
 
-#: src/player.c:2549
+#: src/player.c:2551
 msgid "General"
 msgstr ""
 
-#: src/player.c:2550
+#: src/player.c:2552
 msgid "&General"
 msgstr ""
 
-#: src/player.c:2553
+#: src/player.c:2555
 msgid "Charset"
 msgstr ""
 
-#: src/player.c:2554
+#: src/player.c:2556
 msgid "C&harset"
 msgstr ""
 
-#: src/player.c:2559
+#: src/player.c:2561
 msgid "Plugins manager"
 msgstr ""
 
-#: src/player.c:2619
+#: src/player.c:2621
 msgid "Effect is ena&bled"
 msgstr ""
 
-#: src/player.c:2629
+#: src/player.c:2631
 msgid "&Description: "
 msgstr ""
 
-#: src/player.c:2633
+#: src/player.c:2635
 msgid "&Author: "
 msgstr ""
 
-#: src/player.c:2636
+#: src/player.c:2638
 msgid "Con&figure"
 msgstr ""
 
-#: src/player.c:2643 src/player.c:2688
+#: src/player.c:2645 src/player.c:2690
 msgid "S&tart"
 msgstr ""
 
-#: src/player.c:2687
+#: src/player.c:2689
 msgid "S&top"
 msgstr ""
 
-#: src/player.c:2718
+#: src/player.c:2720
 #, c-format
 msgid "Play list saved to %s"
 msgstr ""
 
-#: src/player.c:2721
+#: src/player.c:2723
 #, c-format
 msgid "Unable to save play list to %s (try naming it as a .m3u file)"
 msgstr ""
 
-#: src/player.c:2731
+#: src/player.c:2734
 msgid ""
 "\n"
 "&#x1b;0;32;40mPress enter to continue"
 msgstr ""
 
-#: src/plist.c:192
+#: src/player.c:2743
+msgid "Command execution failed"
+msgstr ""
+
+#: src/player.c:2751
+msgid "Writing to console failed"
+msgstr ""
+
+#: src/plist.c:195
 #, c-format
 msgid "Unable to read %s file"
 msgstr ""
 
-#: src/plist.c:280
+#: src/plist.c:283
 #, c-format
 msgid "%s: missing play list header"
 msgstr ""
 
-#: src/plist.c:291
+#: src/plist.c:294
 #, c-format
 msgid "%s: missing `numberofentries' tag"
 msgstr ""
 
-#: src/plist.c:896
+#: src/plist.c:899
 #, c-format
 msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
 msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"

mpfc-1.3.8.tar.bz2/po/ru.gmo -> mpfc-1.3.8.1.tar.bz2/po/ru.gmo Changed

mpfc-1.3.8.tar.bz2/po/ru.po -> mpfc-1.3.8.1.tar.bz2/po/ru.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mpfc 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-12 23:18+0300\n"
+"POT-Creation-Date: 2011-03-13 15:17+0300\n"
 "PO-Revision-Date: 2003-02-13 09:15+0300\n"
 "Last-Translator: Sergey E. Galanov <sgsoftware@mail.ru>\n"
 "Language-Team: Russian <sgsoftware@mail.ru>\n"
@@ -29,8 +29,8 @@
 msgid "OK"
 msgstr "OK"
 
-#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:221
-#: plugins/input/audiocd/cddb.c:591
+#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:222
+#: plugins/input/audiocd/cddb.c:592
 #, c-format
 msgid "Connecting to %s"
 msgstr "ðÏÄËÌÀÞÁÀÓØ Ë %s"
@@ -65,12 +65,12 @@
 msgid "Plugin %s has no 'plugin_exchange_data'"
 msgstr "ðÌÁÇÉÎ %s ÎÅ ÉÍÅÅÔ 'plugin_exchange_data'"
 
-#: libmpfc/vfs.c:142 libmpfc/vfs.c:245
+#: libmpfc/vfs.c:143 libmpfc/vfs.c:246
 #, c-format
 msgid "Unable to read directory %s"
 msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ËÁÔÁÌÏÇ %s"
 
-#: libmpfc/vfs.c:214
+#: libmpfc/vfs.c:215
 #, c-format
 msgid "Unable to stat file %s"
 msgstr "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ %s"
@@ -83,89 +83,89 @@
 msgid "Cancel"
 msgstr "ïÔÍÅÎÁ"
 
-#: plugins/input/audiocd/audiocd.c:564
+#: plugins/input/audiocd/audiocd.c:565
 msgid "Configure AudioCD plugin"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ AudioCD"
 
-#: plugins/input/audiocd/audiocd.c:565
+#: plugins/input/audiocd/audiocd.c:566
 msgid "CD &device: "
 msgstr "õÓÔÒÏÊÓÔ×Ï CD (&d): "
 
-#: plugins/input/audiocd/audiocd.c:567
+#: plugins/input/audiocd/audiocd.c:568
 msgid "Use di&gital mode"
 msgstr ""
 
-#: plugins/input/audiocd/audiocd.c:569
+#: plugins/input/audiocd/audiocd.c:570
 msgid "CDDB parameters"
 msgstr "ðÁÒÁÍÅÔÒÙ CDDB"
 
-#: plugins/input/audiocd/audiocd.c:570
+#: plugins/input/audiocd/audiocd.c:571
 msgid "&Host: "
 msgstr "èÏÓÔ (&h): "
 
-#: plugins/input/audiocd/audiocd.c:572
+#: plugins/input/audiocd/audiocd.c:573
 msgid "&Email: "
 msgstr "&Email: "
 
-#: plugins/input/audiocd/audiocd.c:574
+#: plugins/input/audiocd/audiocd.c:575
 msgid "Disc c&ategory: "
 msgstr "ëÁÔÅÇÏÒÉÑ ÄÉÓËÁ (&a): "
 
-#: plugins/input/audiocd/audiocd.c:629
+#: plugins/input/audiocd/audiocd.c:630
 msgid "Reload info from CDDB"
 msgstr "úÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÉÚ CDDB"
 
-#: plugins/input/audiocd/audiocd.c:632
+#: plugins/input/audiocd/audiocd.c:633
 msgid "Submit info to CDDB"
 msgstr "ïÔÐÒÁ×ÉÔØ ÉÎÆÏÒÍÁÃÉÀ × CDDB"
 
-#: plugins/input/audiocd/cddb.c:215 plugins/input/audiocd/cddb.c:585
+#: plugins/input/audiocd/cddb.c:216 plugins/input/audiocd/cddb.c:586
 #, c-format
 msgid "Getting address of %s"
 msgstr "ðÏÌÕÞÁÀ ÁÄÒÅÓ %s"
 
-#: plugins/input/audiocd/cddb.c:234
+#: plugins/input/audiocd/cddb.c:235
 msgid "Sending query to server"
 msgstr "ïÔÐÒÁ×ÌÑÀ ÚÁÐÒÏÓ ÓÅÒ×ÅÒÕ"
 
-#: plugins/input/audiocd/cddb.c:268
+#: plugins/input/audiocd/cddb.c:269
 msgid "Saving data"
 msgstr "óÏÈÒÁÎÑÀ ÄÁÎÎÙÅ"
 
-#: plugins/input/audiocd/cddb.c:270
+#: plugins/input/audiocd/cddb.c:271
 msgid "Success"
 msgstr "õÓÐÅÈ"
 
-#: plugins/input/audiocd/cddb.c:273
+#: plugins/input/audiocd/cddb.c:274
 msgid "Failed!"
 msgstr "ïÂÌÏÍ!"
 
-#: plugins/input/audiocd/cddb.c:379 plugins/input/ogg/ogg.c:346
+#: plugins/input/audiocd/cddb.c:380 plugins/input/ogg/ogg.c:347
 #, fuzzy, c-format
 msgid "Unable to open file %s for writing"
 msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
 
-#: plugins/input/audiocd/cddb.c:561
+#: plugins/input/audiocd/cddb.c:562
 msgid "CDDB submit error: no existing info found"
 msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ÎÅ ÎÁÊÄÅÎÏ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: plugins/input/audiocd/cddb.c:570
+#: plugins/input/audiocd/cddb.c:571
 msgid "CDDB submit error: you must specify your email address"
 msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ Ó×ÏÊ ÁÄÒÅÓ email"
 
-#: plugins/input/audiocd/cddb.c:577
+#: plugins/input/audiocd/cddb.c:578
 msgid "CDDB submit error: you must specify your category"
 msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ËÁÔÅÇÏÒÉÀ"
 
-#: plugins/input/audiocd/cddb.c:604
+#: plugins/input/audiocd/cddb.c:605
 msgid "Posting data to server"
 msgstr "ïÔÐÒÁ×ÌÑÀ ÄÁÎÎÙÅ Ë ÓÅÒ×ÅÒÕ"
 
-#: plugins/input/audiocd/cddb.c:615
+#: plugins/input/audiocd/cddb.c:616
 msgid "Getting response"
 msgstr "ðÏÌÕÞÁÀ ÏÔ×ÅÔ"
 
-#: plugins/input/audiocd/cddb.c:623
+#: plugins/input/audiocd/cddb.c:624
 msgid "Failure!"
 msgstr "ïÂÌÏÍ!"
 
@@ -287,16 +287,16 @@
 msgid "Remove ID3 tags"
 msgstr "õÄÁÌÉÔØ ÔÅÇÉ ID3"
 
-#: plugins/input/ogg/ogg.c:280
+#: plugins/input/ogg/ogg.c:281
 msgid "Only regular files are supported forwriting info by ogg plugin"
 msgstr ""
 
-#: plugins/input/ogg/ogg.c:307 src/plist.c:270
+#: plugins/input/ogg/ogg.c:308 src/plist.c:273
 #, c-format
 msgid "Unable to open file %s"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %s"
 
-#: plugins/input/ogg/ogg.c:378
+#: plugins/input/ogg/ogg.c:379
 #, fuzzy, c-format
 msgid ""
 "Nominal bitrate: %li kb/s\n"
@@ -307,7 +307,7 @@
 "þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i çÃ\n"
 "þÉÓÌÏ ËÁÎÁÌÏ×: %i"
 
-#: plugins/input/ogg/ogg.c:419
+#: plugins/input/ogg/ogg.c:420
 #, fuzzy, c-format
 msgid ""
 "Nominal bitrate: %li kb/s\n"
@@ -322,11 +322,11 @@
 "äÌÉÎÁ: %i ÓÅËÕÎÄ\n"
 "òÁÚÍÅÒ ÆÁÊÌÁ: %i ÂÁÊÔ"
 
-#: plugins/input/ogg/ogg.c:449
+#: plugins/input/ogg/ogg.c:450
 msgid "Configure OggVorbis plugin"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ OggVorbis"
 
-#: plugins/input/ogg/ogg.c:451
+#: plugins/input/ogg/ogg.c:452
 msgid "Always use &UTF-8"
 msgstr "÷ÓÅÇÄÁ ÉÓÐÏÌØÚÏ×ÁÔØ &UTF-8"
 
@@ -392,46 +392,51 @@
 msgid "Configure ALSA plugin"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ alsa"
 
-#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:177
+#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:181
 msgid "&Device: "
 msgstr "õÓÔÒÏÊÓÔ×Ï (&d): "
 
-#: plugins/output/disk_writer/writer.c:89
+#: plugins/output/disk_writer/writer.c:93
 #, c-format
 msgid "Unable to create file %s"
 msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
 
-#: plugins/output/disk_writer/writer.c:312
+#: plugins/output/disk_writer/writer.c:316
 #, c-format
 msgid "Encoding: %s"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:350
+#: plugins/output/disk_writer/writer.c:319
+#, fuzzy
+msgid "Encoder command failed"
+msgstr "ëÏÍÁÎÄÁ (&o): "
+
+#: plugins/output/disk_writer/writer.c:357
 msgid "Configure disk writer plugin"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ disk writer"
 
-#: plugins/output/disk_writer/writer.c:351
+#: plugins/output/disk_writer/writer.c:358
 msgid "P&ath to store: "
 msgstr "ðÕÔØ Ë ËÁÔÁÌÏÇÕ (&a): "
 
-#: plugins/output/disk_writer/writer.c:353
+#: plugins/output/disk_writer/writer.c:360
 msgid "Encoder"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:354
+#: plugins/output/disk_writer/writer.c:361
 msgid "&Enable encoder"
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:356
+#: plugins/output/disk_writer/writer.c:363
 msgid "F&ragment size: "
 msgstr ""
 
-#: plugins/output/disk_writer/writer.c:358
+#: plugins/output/disk_writer/writer.c:365
 #, fuzzy
 msgid "Encoder c&ommand: "
 msgstr "ëÏÍÁÎÄÁ (&o): "
 
-#: plugins/output/oss/oss.c:176
+#: plugins/output/oss/oss.c:180
 msgid "Configure OSS plugin"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ OSS"
 
@@ -448,55 +453,55 @@
 msgid "Enter name you want to search: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ, ËÏÔÏÒÏÅ ×Ù ÈÏÔÉÔÅ ÉÓËÁÔØ: "
 
-#: src/browser.c:622
+#: src/browser.c:623
 msgid "Select files matching pattern"
 msgstr "÷ÙÂÒÁÔØ ÆÁÊÌÙ, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ÛÁÂÌÏÎÕ"
 
-#: src/browser.c:623
+#: src/browser.c:624
 msgid "Deselect files matching pattern"
 msgstr "óÎÑÔØ ×ÙÄÅÌÅÎÉÅ Ó ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÛÁÂÌÏÎÕ"
 
-#: src/browser.c:625
+#: src/browser.c:626
 msgid "P&attern: "
 msgstr "ûÁÂÌÏÎ (&a): "
 
-#: src/browser.c:790
+#: src/browser.c:791
 msgid "File name"
 msgstr "éÍÑ ÆÁÊÌÁ"
 
-#: src/browser.c:796
+#: src/browser.c:797
 msgid "Title"
 msgstr "îÁÚ×ÁÎÉÅ"
 
-#: src/browser.c:802
+#: src/browser.c:803
 msgid "Artist"
 msgstr "éÓÐÏÌÎÉÔÅÌØ"
 
-#: src/browser.c:808
+#: src/browser.c:809
 msgid "Album"
 msgstr "áÌØÂÏÍ"
 
-#: src/browser.c:814
+#: src/browser.c:815
 msgid "Year"
 msgstr "çÏÄ"
 
-#: src/browser.c:820
+#: src/browser.c:821
 msgid "Genre"
 msgstr "öÁÎÒ"
 
-#: src/browser.c:826
+#: src/browser.c:827
 msgid "Track"
 msgstr "ôÒÅË"
 
-#: src/browser.c:832
+#: src/browser.c:833
 msgid "Time"
 msgstr "÷ÒÅÍÑ"
 
-#: src/browser.c:948
+#: src/browser.c:949
 msgid "Change directory"
 msgstr "óÍÅÎÉÔØ ËÁÔÁÌÏÇ"
 
-#: src/browser.c:949
+#: src/browser.c:950
 msgid "&Directory: "
 msgstr "ëÁÔÁÌÏÇ (&d): "
 
@@ -508,7 +513,7 @@
 msgid "Load preset from a Winamp EQF file"
 msgstr "úÁÇÒÕÚÉÔØ ÐÒÅÓÅÔ ÉÚ ÆÁÊÌÁ Winamp EQF"
 
-#: src/eqwnd.c:215 src/player.c:2172 src/player.c:2418
+#: src/eqwnd.c:215 src/player.c:2174 src/player.c:2420
 msgid "&Name: "
 msgstr "éÍÑ (&n): "
 
@@ -886,7 +891,7 @@
 "öÕÒÎÁÌ MPFC %s\n"
 "%s"
 
-#: src/player.c:220 src/plist.c:302
+#: src/player.c:220 src/plist.c:305
 msgid "No enough memory"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ"
 
@@ -898,231 +903,231 @@
 msgid "Unable to initialize play list window"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÏËÎÏ ÐÌÅÊ-ÌÉÓÔÁ"
 
-#: src/player.c:266
+#: src/player.c:268
 msgid "Unable to initialize plugin manager"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÍÅÎÅÄÖÅÒ ÐÌÁÇÉÎÏ×"
 
-#: src/player.c:277
+#: src/player.c:279
 msgid "Unable to initialize VFS module"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÍÏÄÕÌØ VFS"
 
-#: src/player.c:286
+#: src/player.c:288
 msgid "Unable to initialize info read/write thread"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÔÏË ÞÔÅÎÉÑ/ÚÁÐÉÓÉ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: src/player.c:295
+#: src/player.c:297
 msgid "Unable to initialize undo list"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÓÐÉÓÏË ÏÔÍÅÎ"
 
-#: src/player.c:303
+#: src/player.c:305
 msgid "Play list initialization failed"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÌÅÊ-ÌÉÓÔ"
 
-#: src/player.c:314
+#: src/player.c:316
 msgid "Unable to initialize set of files for play list"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ× ÄÌÑ ÐÌÅÊ-ÌÉÓÔÁ"
 
-#: src/player.c:336
+#: src/player.c:338
 msgid "Unable to initialize player thread"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÔÏË ÐÌÅÊÅÒÁ"
 
-#: src/player.c:363
+#: src/player.c:365
 msgid "Player initialized"
 msgstr "ðÌÅÊÅÒ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎ"
 
-#: src/player.c:382
+#: src/player.c:384
 msgid "Play list"
 msgstr "ðÌÅÊ-ÌÉÓÔ"
 
-#: src/player.c:502
+#: src/player.c:504
 msgid "Left MPFC"
 msgstr "÷ÙÛÌÉ ÉÚ MPFC"
 
-#: src/player.c:945 src/player.c:2957 src/player.c:2998
+#: src/player.c:947 src/player.c:2967 src/player.c:3008
 #, c-format
 msgid "String `%s' not found"
 msgstr "óÔÒÏËÁ `%s' ÎÅ ÎÁÊÄÅÎÁ"
 
-#: src/player.c:949 src/player.c:2961 src/player.c:3002
+#: src/player.c:951 src/player.c:2971 src/player.c:3012
 #, c-format
 msgid "String `%s' found at position %d"
 msgstr "óÔÒÏËÁ `%s' ÎÁÊÄÅÎÁ × ÐÏÚÉÃÉÉ %d"
 
-#: src/player.c:1341
+#: src/player.c:1343
 msgid "SG Software Media Player For Console"
 msgstr "ðÌÅÊÅÒ ÄÌÑ ËÏÎÓÏÌÉ ÏÔ SG Software"
 
-#: src/player.c:1344 src/player.c:1381
+#: src/player.c:1346 src/player.c:1383
 msgid "Shuffle"
 msgstr "óÌÕÞÁÊÎÏ"
 
-#: src/player.c:1345 src/player.c:1382
+#: src/player.c:1347 src/player.c:1384
 msgid "Loop"
 msgstr "ãÉËÌÉÞÅÓËÉ"
 
-#: src/player.c:1365
+#: src/player.c:1367
 #, c-format
 msgid "version %s"
 msgstr "×ÅÒÓÉÑ %s"
 
-#: src/player.c:1850
+#: src/player.c:1852
 #, c-format
 msgid "Input plugin for file %s failed"
 msgstr "÷ÈÏÄÎÏÊ ÐÌÁÇÉÎ ÏÂÌÏÍÉÌÓÑ Ó ÆÁÊÌÏÍ %s"
 
-#: src/player.c:1877
+#: src/player.c:1879
 msgid "Output plugin initialization failed"
 msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÐÌÁÇÉÎ"
 
-#: src/player.c:2093
+#: src/player.c:2095
 msgid "Add songs"
 msgstr "äÏÂÁ×ÉÔØ ÐÅÓÎÉ"
 
-#: src/player.c:2094 src/player.c:2109
+#: src/player.c:2096 src/player.c:2111
 msgid "File &name: "
 msgstr "éÍÑ ÆÁÊÌÁ (&n): "
 
-#: src/player.c:2108
+#: src/player.c:2110
 msgid "Save play list"
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊ-ÌÉÓÔ"
 
-#: src/player.c:2122
+#: src/player.c:2124
 msgid "Execute external command"
 msgstr "÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ"
 
-#: src/player.c:2123
+#: src/player.c:2125
 msgid "C&ommand: "
 msgstr "ëÏÍÁÎÄÁ (&o): "
 
-#: src/player.c:2137
+#: src/player.c:2139
 msgid "Sort play list"
 msgstr "óÏÒÔÉÒÏ×ÁÔØ ÐÌÅÊ-ÌÉÓÔ"
 
-#: src/player.c:2138
+#: src/player.c:2140
 msgid "Sort by"
 msgstr "óÏÒÔÉÒÏ×ÁÔØ ÐÏ"
 
-#: src/player.c:2139 src/player.c:2447
+#: src/player.c:2141 src/player.c:2449
 msgid "&Title"
 msgstr "îÁÚ×ÁÎÉÅ (&t)"
 
-#: src/player.c:2140
+#: src/player.c:2142
 msgid "&File name"
 msgstr "éÍÑ ÆÁÊÌÁ (&f)"
 
-#: src/player.c:2141
+#: src/player.c:2143
 msgid "P&ath and file name"
 msgstr "ðÕÔØ É ÉÍÑ ÆÁÊÌÁ (&a)"
 
-#: src/player.c:2142 src/player.c:2453
+#: src/player.c:2144 src/player.c:2455
 msgid "T&rack"
 msgstr "ôÒÅË (&r)"
 
-#: src/player.c:2143
+#: src/player.c:2145
 msgid "&Only selected area"
 msgstr "ôÏÌØËÏ ×ÙÄÅÌÅÎÎÁÑ ÏÂÌÁÓÔØ (o)"
 
-#: src/player.c:2174
+#: src/player.c:2176
 msgid "&Artist: "
 msgstr "éÓÐÏÌÎÉÔÅÌØ (&a): "
 
-#: src/player.c:2176
+#: src/player.c:2178
 msgid "A&lbum: "
 msgstr "áÌØÂÏÍ (&l): "
 
-#: src/player.c:2178
+#: src/player.c:2180
 msgid "&Year: "
 msgstr "çÏÄ (&y): "
 
-#: src/player.c:2180
+#: src/player.c:2182
 msgid "&Track No: "
 msgstr "îÏÍÅÒ ÔÒÅËÁ (&t): "
 
-#: src/player.c:2182
+#: src/player.c:2184
 msgid "C&omments: "
 msgstr "ëÏÍÍÅÎÔÁÒÉÉ (&o): "
 
-#: src/player.c:2184
+#: src/player.c:2186
 msgid "&Genre: "
 msgstr "öÁÎÒ (&g): "
 
-#: src/player.c:2187
+#: src/player.c:2189
 msgid "&Reload info"
 msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ (&r)"
 
-#: src/player.c:2250
+#: src/player.c:2252
 msgid "Write in&fo in all the selected songs"
 msgstr "úÁÐÉÓÁÔØ ×Ï ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÐÅÓÎÉ (&a)"
 
-#: src/player.c:2401
+#: src/player.c:2403
 msgid "Search"
 msgstr "ðÏÉÓË"
 
-#: src/player.c:2402 src/player.c:2443
+#: src/player.c:2404 src/player.c:2445
 msgid "S&tring: "
 msgstr "óÔÒÏËÁ (&t): "
 
-#: src/player.c:2417
+#: src/player.c:2419
 msgid "Variables manager"
 msgstr "íÅÎÅÄÖÅÒ ÐÅÒÅÍÅÎÎÙÈ"
 
-#: src/player.c:2421
+#: src/player.c:2423
 msgid "&Value: "
 msgstr "úÎÁÞÅÎÉÅ (&v): "
 
-#: src/player.c:2424
+#: src/player.c:2426
 msgid "Vie&w current value"
 msgstr "ðÏÓÍÏÔÒÅÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ (.w)"
 
-#: src/player.c:2426
+#: src/player.c:2428
 msgid "Operation"
 msgstr "ïÐÅÒÁÃÉÑ"
 
-#: src/player.c:2427
+#: src/player.c:2429
 msgid "S&et"
 msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
 
-#: src/player.c:2428
+#: src/player.c:2430
 msgid "&Add"
 msgstr "äÏÂÁ×ÉÔØ (&a)"
 
-#: src/player.c:2429
+#: src/player.c:2431
 msgid "&Remove"
 msgstr "õÄÁÌÉÔØ (&r)"
 
-#: src/player.c:2442
+#: src/player.c:2444
 msgid "Advanced search"
 msgstr "ðÒÏÄ×ÉÎÕÔÙÊ ÐÏÉÓË"
 
-#: src/player.c:2446
+#: src/player.c:2448
 msgid "Search in"
 msgstr "éÓËÁÔØ ×"
 
-#: src/player.c:2448
+#: src/player.c:2450
 msgid "&Name"
 msgstr "éÍÑ (&n)"
 
-#: src/player.c:2449
+#: src/player.c:2451
 msgid "&Artist"
 msgstr "éÓÐÏÌÎÉÔÅÌØ (&a)"
 
-#: src/player.c:2450
+#: src/player.c:2452
 msgid "A&lbum"
 msgstr "áÌØÂÏÍ (&l)"
 
-#: src/player.c:2451
+#: src/player.c:2453
 msgid "&Year"
 msgstr "çÏÄ (&y)"
 
-#: src/player.c:2452
+#: src/player.c:2454
 msgid "&Genre"
 msgstr "öÁÎÒ (&g)"
 
-#: src/player.c:2454
+#: src/player.c:2456
 msgid "C&omment"
 msgstr "ëÏÍÍÅÎÔÁÒÉÉ (&o)"
 
-#: src/player.c:2468
+#: src/player.c:2470
 #, c-format
 msgid "Removed %d song"
 msgid_plural "Removed %d songs"
@@ -1130,113 +1135,113 @@
 msgstr1 "õÄÁÌÅÎÏ %d ÐÅÓÎÉ"
 msgstr2 "õÄÁÌÅÎÏ %d ÐÅÓÅÎ"
 
-#: src/player.c:2476
+#: src/player.c:2478
 msgid "Reload info"
 msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ"
 
-#: src/player.c:2477
+#: src/player.c:2479
 msgid "&Only in selected area"
 msgstr "ôÏÌØËÏ × ×ÙÄÅÌÅÎÎÏÊ ÏÂÌÁÓÔÉ (&o)"
 
-#: src/player.c:2490
+#: src/player.c:2492
 msgid "Run/stop test"
 msgstr "úÁÐÕÓÔÉÔØ/ÏÓÔÁÎÏ×ÉÔØ ÔÅÓÔ"
 
-#: src/player.c:2491
+#: src/player.c:2493
 msgid "Tests"
 msgstr "ôÅÓÔÙ"
 
-#: src/player.c:2492
+#: src/player.c:2494
 msgid "Test &1. Window library perfomance"
 msgstr "ôÅÓÔ &1. ðÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ ÏËÏÎÎÏÊ ÂÉÂÌÉÏÔÅËÉ"
 
-#: src/player.c:2494
+#: src/player.c:2496
 msgid "&Stop job"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÚÁÄÁÞÕ (&s)"
 
-#: src/player.c:2537
+#: src/player.c:2539
 msgid "Input"
 msgstr "÷ÈÏÄÎÙÅ"
 
-#: src/player.c:2538
+#: src/player.c:2540
 msgid "&Input"
 msgstr "÷ÈÏÄÎÙÅ (&i)"
 
-#: src/player.c:2541
+#: src/player.c:2543
 msgid "Output"
 msgstr "÷ÙÈÏÄÎÙÅ"
 
-#: src/player.c:2542
+#: src/player.c:2544
 msgid "&Output"
 msgstr "÷ÙÈÏÄÎÙÅ (&o)"
 
-#: src/player.c:2545
+#: src/player.c:2547
 msgid "Effect"
 msgstr "üÆÆÅËÔÙ"
 
-#: src/player.c:2546
+#: src/player.c:2548
 msgid "&Effect"
 msgstr "üÆÆÅËÔÙ (&e)"
 
-#: src/player.c:2549
+#: src/player.c:2551
 #, fuzzy
 msgid "General"
 msgstr "öÁÎÒ"
 
-#: src/player.c:2550
+#: src/player.c:2552
 #, fuzzy
 msgid "&General"
 msgstr "öÁÎÒ (&g)"
 
-#: src/player.c:2553
+#: src/player.c:2555
 msgid "Charset"
 msgstr "ëÏÄÉÒÏ×ËÉ"
 
-#: src/player.c:2554
+#: src/player.c:2556
 msgid "C&harset"
 msgstr "ëÏÄÉÒÏ×ËÉ (&h)"
 
-#: src/player.c:2559
+#: src/player.c:2561
 msgid "Plugins manager"
 msgstr "íÅÎÅÄÖÅÒ ÐÌÁÇÉÎÏ×"
 
-#: src/player.c:2619
+#: src/player.c:2621
 msgid "Effect is ena&bled"
 msgstr "üÆÆÅËÔ ×ËÌÀÞÅÎ (&b)"
 
-#: src/player.c:2629
+#: src/player.c:2631
 msgid "&Description: "
 msgstr "ïÐÉÓÁÎÉÅ (&d): "
 
-#: src/player.c:2633
+#: src/player.c:2635
 msgid "&Author: "
 msgstr "á×ÔÏÒ (&a): "
 
-#: src/player.c:2636
+#: src/player.c:2638
 msgid "Con&figure"
 msgstr "ëÏÎÆÉÇÕÒÉÒÏ×ÁÔØ (&f)"
 
-#: src/player.c:2643 src/player.c:2688
+#: src/player.c:2645 src/player.c:2690
 #, fuzzy
 msgid "S&tart"
 msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
 
-#: src/player.c:2687
+#: src/player.c:2689
 #, fuzzy
 msgid "S&top"
 msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
 
-#: src/player.c:2718
+#: src/player.c:2720
 #, c-format
 msgid "Play list saved to %s"
 msgstr "ðÌÅÊ-ÌÉÓÔ ÓÏÈÒÁÎÅÎ × %s"
 
-#: src/player.c:2721
+#: src/player.c:2723
 #, fuzzy, c-format
 msgid "Unable to save play list to %s (try naming it as a .m3u file)"
 msgstr "îÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÐÌÅÊ-ÌÉÓÔ × %s"
 
-#: src/player.c:2731
+#: src/player.c:2734
 msgid ""
 "\n"
 "&#x1b;0;32;40mPress enter to continue"
@@ -1244,22 +1249,30 @@
 "\n"
 "&#x1b;0;32;40mîÁÖÍÉÔÅ enter, ÞÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ"
 
-#: src/plist.c:192
+#: src/player.c:2743
+msgid "Command execution failed"
+msgstr ""
+
+#: src/player.c:2751
+msgid "Writing to console failed"
+msgstr ""
+
+#: src/plist.c:195
 #, c-format
 msgid "Unable to read %s file"
 msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
 
-#: src/plist.c:280
+#: src/plist.c:283
 #, c-format
 msgid "%s: missing play list header"
 msgstr "%s: ÏÔÓÕÔÓÔ×ÕÅÔ ÚÁÇÏÌÏ×ÏË ÐÌÅÊ-ÌÉÓÔÁ"
 
-#: src/plist.c:291
+#: src/plist.c:294
 #, c-format
 msgid "%s: missing `numberofentries' tag"
 msgstr "%s: ÏÔÓÕÔÓÔ×ÕÅÔ ÔÅÇ `numberofentries'"
 
-#: src/plist.c:896
+#: src/plist.c:899
 #, c-format
 msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
 msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"

mpfc-1.3.8.tar.bz2/src/browser.c -> mpfc-1.3.8.1.tar.bz2/src/browser.c Changed

mpfc-1.3.8.tar.bz2/src/eqwnd.c -> mpfc-1.3.8.1.tar.bz2/src/eqwnd.c Changed

mpfc-1.3.8.tar.bz2/src/player.c -> mpfc-1.3.8.1.tar.bz2/src/player.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Main player functions implementation.
- * $Id: player.c 298 2011-01-04 19:29:16Z sg2 $
+ * $Id: player.c 308 2011-03-13 12:16:29Z sg2 $
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -255,8 +255,10 @@
 	logger_attach_handler(player_log, player_on_log_msg, NULL);
 
 	/* Initialize file browser directory */
-	getcwd(player_fb_dir, sizeof(player_fb_dir));
-	strcat(player_fb_dir, "/");
+	if (getcwd(player_fb_dir, sizeof(player_fb_dir)) == NULL)
+		strcpy(player_fb_dir, "/");
+	else
+		strcat(player_fb_dir, "/");
 	
 	/* Initialize plugin manager */
 	logger_debug(player_log, "Initializing plugin manager");
@@ -1664,7 +1666,7 @@
 	int len, base, song;
 	
 	if (player_plist == NULL || !player_plist->m_len)
-		return;
+		return -1;
 	
 	/* Change current song */
 	song = player_plist->m_cur_song;
@@ -2727,6 +2729,7 @@
 wnd_msg_retcode_t player_on_exec( wnd_t *wnd )
 {
 	int fd;
+	int len;
 	editbox_t *eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "command"));
 	char *text = _("\n\0330;32;40mPress enter to continue");
 	assert(eb);
@@ -2735,11 +2738,18 @@
 	wnd_close_curses(wnd_root);
 
 	/* Execute command */
-	system(EDITBOX_TEXT(eb));
+	if (system(EDITBOX_TEXT(eb)) < 0)
+	{
+		logger_error(player_log, 0, _("Command execution failed"));
+	}
 
 	/* Display text (mere printf doesn't work) */
 	fd = open("/dev/tty", O_WRONLY);
-	write(fd, text, strlen(text));
+	len = strlen(text);
+	if (write(fd, text, len) != len)
+	{
+		logger_error(player_log, 0, _("Writing to console failed"));
+	}
 	close(fd);
 	getchar();

mpfc-1.3.8.tar.bz2/src/plist.c -> mpfc-1.3.8.1.tar.bz2/src/plist.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Play list manipulation functions.
- * $Id: plist.c 266 2008-02-08 22:12:25Z sg2 $
+ * $Id: plist.c 307 2011-03-13 11:58:47Z sg2 $
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -20,6 +20,7 @@
  * MA 02111-1307, USA.
  */
 
+#include <ctype.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -36,6 +37,8 @@
 #include "undo.h"
 #include "wnd.h"
 
+extern void pmng_hook( pmng_t *pmng, char *hook );
+
 /* Number of files added by plist_add_set */
 int plist_num = 0;
 
@@ -224,7 +227,7 @@
 			break;
 
 		/* Extract song length from string read */
-		for ( i = 8, j = 0; stri && stri != ',' && j < sizeof(len); 
+		for ( i = 8, j = 0; stri && stri != ',' && j < (sizeof(len) - 1); 
 				i ++, j ++ )
 			lenj = stri;
 		lenj = 0;
@@ -711,7 +714,7 @@
 
 	assert(pl);
 	if (!pl->m_len)
-		return;
+		return FALSE;
 
 	/* Search */
 	for ( i = pl->m_sel_end, count = 0; count < pl->m_len && !found; count ++ )

Changes of Revision 3