Revert "Use (s)mplayer2 instead of (s)mplayer"

This reverts commit f8ec23cf3051b04d4d107e923ce2110848f0dbf3.

diff --git a/.mc/menu b/.mc/menu
index 220f66fcafa72caae778ef5910b602a7d56a3c55..f549ae4765ba61cd162632acbe68bf437f9bfc46 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -162,14 +162,14 @@ c  Play the current directory with smplayer
 
 + t r & f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
 i  Audio/video info
-   exec mplayer2 -msglevel identify=6 -frames 0 %s
+   exec mplayer -msglevel identify=6 -frames 0 %s
 
 + t d & f (video_ts|VIDEO_TS)$
 i  DVD info
-   exec mplayer2 -dvd-device . dvd:// -msglevel identify=6 -frames 0
+   exec mplayer -dvd-device . dvd:// -msglevel identify=6 -frames 0
 
 + f \.(avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
-m  Play video file(s) with mplayer2
+m  Play video file(s) with mplayer
    mplayer %s &
 
 + f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
@@ -177,7 +177,7 @@ M  Play audio/video with gmplayer
    gmplayer %s &
 
 + t d & f (video_ts|VIDEO_TS)$
-d  Play DVD directory with mplayer2
+d  Play DVD directory with mplayer
    mplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
@@ -185,7 +185,7 @@ D  Play DVD directory with gmplayer
    gmplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
-t  Play DVD title with mplayer2
+t  Play DVD title with mplayer
    title=%{Enter title}
    mplayer -dvd-device . dvd://"$title" &
 
@@ -195,7 +195,7 @@ T  Play DVD title with gmplayer
    gmplayer -dvd-device . dvd://"$title" &
 
 + t d
-p  Play directory with mplayer2
+p  Play directory with mplayer
    mplayer %f/* &
 
 + t d

diff --git a/bin/mplay b/bin/mplay
index 4fcdc7d9dfa16774ba5c1d9b809430e07c83c82e..47862336c1160fca832e8992cec23b7c290c5a63 100755 (executable)
--- a/bin/mplay
+++ b/bin/mplay
@@ -7,7 +7,7 @@ if [ "$DISPLAY" ]; then
    xset -dpms s off) &
 fi
 
-cgmem_nice 500 "`basename $0`"er2 $options "$@"
+cgmem_nice 500 "`basename $0`"er $options "$@"
 
 if [ "$DISPLAY" ]; then
    cd "$HOME"

diff --git a/bin/smplay b/bin/smplay
index 77c108725e7d27876220c853114b5d42ea98d1ef..856129936558524bfebc7f3d96b12c2731e71f1f 100755 (executable)
--- a/bin/smplay
+++ b/bin/smplay
@@ -14,7 +14,7 @@ else
    exit 1
 fi
 
-cgmem_nice 500 smplayer2 "$GUI" "$@"
+cgmem_nice 500 smplayer "$GUI" "$@"
 "$HOME"/admin/prog/audio-cdr-video/audio/pa-volume
 
 cd "$HOME"