Mon Nov 6 23:57:15 CET 2006

Author: diego
Date: Mon Nov  6 23:57:14 2006
New Revision: 20739

Removed:
   trunk/libmpcodecs/vf_fame.c
Modified:
   trunk/Gui/cfg.c
   trunk/Gui/cfg.h
   trunk/Gui/interface.c
   trunk/Gui/mplayer/gtk/opts.c
   trunk/Makefile
   trunk/configure
   trunk/help/help_mp-en.h
   trunk/libmpcodecs/Makefile
   trunk/libmpcodecs/vf.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/xml/en/video.xml
   trunk/help/help_mp-bg.h
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-de.h
   trunk/help/help_mp-dk.h
   trunk/help/help_mp-el.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-ja.h
   trunk/help/help_mp-ko.h
   trunk/help/help_mp-mk.h
   trunk/help/help_mp-nl.h
   trunk/help/help_mp-pl.h
   trunk/help/help_mp-pt_BR.h
   trunk/help/help_mp-ro.h
   trunk/help/help_mp-ru.h
   trunk/help/help_mp-sk.h
   trunk/help/help_mp-sv.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-uk.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Log:
Remove remnants of long-gone libfame.


Modified: trunk/Gui/cfg.c
==============================================================================

--- trunk/Gui/cfg.c	(original)
+++ trunk/Gui/cfg.c	Mon Nov  6 23:57:14 2006
@@ -26,9 +26,6 @@
 #ifdef USE_LIBAVCODEC
  int    gtkVopLAVC = 0;
 #endif
-#ifdef USE_LIBFAME
- int    gtkVopFAME = 0;
-#endif
 
 int    gtkAONorm = 0;
 int    gtkAOSurround = 0;
@@ -110,9 +107,6 @@
 #ifdef USE_LIBAVCODEC
  { "vf_lavc",&gtkVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
 #endif
-#ifdef USE_LIBFAME
- { "vf_fame",&gtkVopFAME,CONF_TYPE_FLAG,0,0,1,NULL },
-#endif
 
  { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "ao_volnorm",&gtkAONorm,CONF_TYPE_FLAG,0,0,1,NULL },

Modified: trunk/Gui/cfg.h
==============================================================================
--- trunk/Gui/cfg.h	(original)
+++ trunk/Gui/cfg.h	Mon Nov  6 23:57:14 2006
@@ -6,7 +6,6 @@
 
 extern int    gtkVopPP;
 extern int    gtkVopLAVC;
-extern int    gtkVopFAME;
 
 extern int    gtkAONorm;
 extern int    gtkAOFakeSurround;

Modified: trunk/Gui/interface.c
==============================================================================
--- trunk/Gui/interface.c	(original)
+++ trunk/Gui/interface.c	Mon Nov  6 23:57:14 2006
@@ -732,12 +732,9 @@
 #ifdef USE_LIBAVCODEC
 	 && !gtkVopLAVC
 #endif
-#ifdef USE_LIBFAME
-	 && !gtkVopFAME 
-#endif
 	 )
 	 {
-	  gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME );
+	  gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVC );
 	  guiIntfStruct.Playing=0;
 	  return True;
 	 }
@@ -823,9 +820,6 @@
 #ifdef USE_LIBAVCODEC
 	remove_vop( "lavc" );
 #endif
-#ifdef USE_LIBFAME
-	remove_vop( "fame" );
-#endif
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) )
 	 {
 	  if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
@@ -833,9 +827,6 @@
 #ifdef USE_LIBAVCODEC
 	    if ( gtkVopLAVC ) add_vop( "lavc" );
 #endif
-#ifdef USE_LIBFAME
-	    if ( gtkVopFAME ) add_vop( "fame" );
-#endif
 	   }
 	 }
 #endif

Modified: trunk/Gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/Gui/mplayer/gtk/opts.c	(original)
+++ trunk/Gui/mplayer/gtk/opts.c	Mon Nov  6 23:57:14 2006
@@ -1714,9 +1714,6 @@
 #ifdef USE_LIBAVCODEC
  static GtkWidget * RBVLavc;
 #endif
-#ifdef USE_LIBFAME
- static GtkWidget * RBVFame;
-#endif
 static GtkWidget * dxr3BOk;
 static GtkWidget * dxr3BCancel;
 
@@ -1733,10 +1730,7 @@
 #ifdef USE_LIBAVCODEC
  if ( gtkVopLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE );
 #endif
-#ifdef USE_LIBFAME
- if ( gtkVopFAME ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVFame ),TRUE );
-#endif
- 
+
  gtk_widget_show( DXR3Config );
  gtkSetLayer( DXR3Config );
 }
@@ -1758,9 +1752,6 @@
 #ifdef USE_LIBAVCODEC
        gtkVopLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
 #endif
-#ifdef USE_LIBFAME
-       gtkVopFAME=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVFame ) );
-#endif
   case 1: // Cancel
        HideDXR3Config();
        break;
@@ -1813,7 +1804,7 @@
  gtk_widget_show( CEDXR3Device );
  gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" );
 
-#if defined( USE_LIBAVCODEC ) || defined( USE_LIBFAME )
+#if defined( USE_LIBAVCODEC )
  AddHSeparator( vbox2 );
  vbox3=AddVBox( vbox2,0 );
  AddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 );
@@ -1821,9 +1812,6 @@
 #ifdef USE_LIBAVCODEC
  RBVLavc=AddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 );
 #endif
-#ifdef USE_LIBFAME
- RBVFame=AddRadioButton( MSGTR_PREFERENCES_DXR3_FAME,&VEncoder_group,vbox3 );
-#endif
 
 #endif
 

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Nov  6 23:57:14 2006
@@ -111,9 +111,6 @@
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
-ifeq ($(FAME),yes)
-PARTS += libfame
-endif
 ifeq ($(DVDREAD_INTERNAL),yes)
 PARTS += libdvdread
 PARTS += libdvdcss
@@ -170,9 +167,6 @@
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
 endif
-ifeq ($(FAME),yes)
-COMMON_DEPS += libfame/libfame.a
-endif
 ifeq ($(DVDREAD_INTERNAL),yes)
 COMMON_DEPS += libdvdread/libdvdread.a
 COMMON_LIBS += libdvdread/libdvdread.a
@@ -216,9 +210,6 @@
 loader/libloader.a:
 	$(MAKE) -C loader
 
-libfame/libfame.a:
-	$(MAKE) -C libfame
-
 libass/libass.a:
 	$(MAKE) -C libass
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Nov  6 23:57:14 2006
@@ -286,7 +286,6 @@
   --disable-libpostproc_so  disable shared libpostproc [autodetect]
   --disable-libavcodec_mpegaudio_hp disable high precision audio decoding
                                     in libavcodec [enabled]
-  --enable-libfame          enable libfame realtime encoder [autodetect]
   --disable-tremor-internal disable internal Tremor [enabled]
   --enable-tremor-low       enable lower accuracy internal Tremor [disabled]
   --enable-tremor-external  enable external Tremor [autodetect]
@@ -1564,7 +1563,6 @@
 _libpostproc=auto
 _libpostproc_so=auto
 _libavcodec_mpegaudio_hp=yes
-_libfame=auto
 _mencoder=yes
 _x11=auto
 _xshape=auto
@@ -1959,8 +1957,6 @@
   --enable-libavcodec_mpegaudio_hp)	_libavcodec_mpegaudio_hp=yes	;;
   --disable-libavcodec_mpegaudio_hp)	_libavcodec_mpegaudio_hp=no	;;
 
-  --enable-libfame)	_libfame=yes	;;
-  --disable-libfame)	_libfame=no	;;
   --enable-lirc)	_lirc=yes	;;
   --disable-lirc)	_lirc=no	;;
   --enable-lircc)	_lircc=yes	;;
@@ -4740,30 +4736,6 @@
 echores "$_ivtv"
 
 
-echocheck "libfame"
-if test "$_libfame" = auto ; then
-  _libfame=no
-  test "$_dxr2" = yes && _libfame=auto
-  test "$_dxr3" = yes && _libfame=auto
-  test "$_dvb"  = yes && _libfame=auto
-fi
-if test "$_libfame" = auto ; then
-  _libfame=no
-  if test -d libfame && test -f libfame/fame.h ; then
-    # disable libfame on Cygwin as porting makes no sense
-    cygwin || _libfame=yes
-  else
-    _res_comment="no libfame dir"
-  fi
-fi
-echores "$_libfame"
-
-_def_libfame='#undef USE_LIBFAME'
-if test "$_libfame" = yes ; then
-  _def_libfame='#define USE_LIBFAME 1'
-  _ld_libfame='libfame/libfame.a'
-fi
-
 
 #########
 # AUDIO #
@@ -7423,7 +7395,7 @@
   $_ld_static $_ld_zlib $_ld_termcap $_ld_lirc $_ld_lircc $_ld_win32 \
   $_ld_win32libs $_ld_lm $_ld_libC $_ld_fribidi $_ld_smb $_ld_gif \
   $_ld_libcdio $_ld_dvdread $_ld_dvdnav $_macosx_frameworks $_ld_cdparanoia \
-  $_ld_libfame $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \
+  $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \
   $_ld_vorbis $_ld_libdv $_ld_theora $_ld_faad $_ld_speex $_xmms_lib \
   $_toolame_lib $_twolame_lib $_ld_faac $_ld_musepack $_ld_liblzo $_ld_png \
   $_ld_jpeg $_ld_alsa $_ld_nut $_ld_arch $_ld_iconv $_ld_mlib
@@ -7486,7 +7458,6 @@
 CONFIG_LIBPOSTPROC = $_libpostproc
 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
 ZORAN = $_zr
-FAME = $_libfame
 LIBDV = $_libdv
 XVID = $_xvid
 XVID4 = $_xvid4
@@ -7909,9 +7880,6 @@
 $_def_libdts
 $_def_libmpeg2
 
-/* Use libfame encoder filter */
-$_def_libfame
-
 /* XAnim DLL support */
 $_def_xanim
 /* Default search path */

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	(original)
+++ trunk/help/help_mp-en.h	Mon Nov  6 23:57:14 2006
@@ -723,7 +723,7 @@
 #define MSGTR_NEMDB "Sorry, not enough memory to draw buffer."
 #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering."
 #define MSGTR_IDFGCVD "Sorry, I did not find a GUI-compatible video output driver."
-#define MSGTR_NEEDLAVCFAME "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc or fame in the DXR3/H+ configuration box."
+#define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box."
 #define MSGTR_UNKNOWNWINDOWTYPE "Unknown window type found ..."
 
 // --- skin loader error messages
@@ -887,7 +887,6 @@
 #define MSGTR_PREFERENCES_Message "Please remember that you need to restart playback for some options to take effect!"
 #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:"
 #define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC (FFmpeg)"
-#define MSGTR_PREFERENCES_DXR3_FAME "Use FAME"
 #define MSGTR_PREFERENCES_FontEncoding1 "Unicode"
 #define MSGTR_PREFERENCES_FontEncoding2 "Western European Languages (ISO-8859-1)"
 #define MSGTR_PREFERENCES_FontEncoding3 "Western European Languages with Euro (ISO-8859-15)"
@@ -1594,9 +1593,6 @@
 #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices  "WARNING! Next filter doesn't support SLICES, get ready for sig11...\n"
 #define MSGTR_MPCODECS_FunWhydowegetNULL "Why do we get NULL??\n"
 
-// libmpcodecs/vf_fame.c
-#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATAL: Cannot open libFAME!\n"
-
 // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c
 #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s not supported by next filter/vo :(\n"
 

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Mon Nov  6 23:57:14 2006
@@ -250,10 +250,6 @@
             native/RTjpegN.c \
             native/xa_gsm.c \
 
-ifeq ($(FAME),yes)
-VFILTER_SRCS += vf_fame.c
-endif
-
 ifeq ($(ZORAN),yes)
 VFILTER_SRCS += vf_zrmjpeg.c
 endif

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	(original)
+++ trunk/libmpcodecs/vf.c	Mon Nov  6 23:57:14 2006
@@ -30,7 +30,6 @@
 extern vf_info_t vf_info_expand;
 extern vf_info_t vf_info_pp;
 extern vf_info_t vf_info_scale;
-extern vf_info_t vf_info_fame;
 extern vf_info_t vf_info_format;
 extern vf_info_t vf_info_noformat;
 extern vf_info_t vf_info_yuy2;
@@ -114,9 +113,6 @@
     &vf_info_scale,
 //    &vf_info_osd,
     &vf_info_vo,
-#ifdef USE_LIBFAME
-    &vf_info_fame,
-#endif
     &vf_info_format,
     &vf_info_noformat,
     &vf_info_yuy2,

