From 78bbfea7f242f6eeb30522569c3323810d8542b4 Mon Sep 17 00:00:00 2001
From: albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 30 May 2007 07:07:32 +0000
Subject: Drop the metadata stuff and replace it with generic property string
 expansion.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23416 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/menu.conf | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'etc/menu.conf')

diff --git a/etc/menu.conf b/etc/menu.conf
index 699ad974eb..603d527495 100644
--- a/etc/menu.conf
+++ b/etc/menu.conf
@@ -65,20 +65,21 @@
 </cmdlist>
 
 <pref name="properties" title="Stream Properties">
-      <e meta="name" name="Name"/>
-      <e meta="vcodec" name="Video Codec"/>
-      <e meta="vbitrate" name="Video Bitrate"/>
-      <e meta="resolution" name="Resolution"/>
-      <e meta="acodec" name="Audio Codec"/>
-      <e meta="abitrate" name="Audio Bitrate"/>
-      <e meta="asamples" name="Audio Samples"/>
-      <e meta="title" name="Title"/>
-      <e meta="artist" name="Artist"/>
-      <e meta="album" name="Album"/>
-      <e meta="year" name="Year"/>
-      <e meta="comment" name="Comment"/>
-      <e meta="track" name="Track"/>
-      <e meta="genre" name="Genre"/>
+      <e txt="${filename}" name="Name"/>
+      <e txt="${video_format}" name="Video Codec"/>
+      <e txt="${video_bitrate}" name="Video Bitrate"/>
+      <e txt="${width} x ${height}" name="Resolution"/>
+      <e txt="${audio_codec}" name="Audio Codec"/>
+      <e txt="${audio_bitrate}" name="Audio Bitrate"/>
+      <e txt="${samplerate}, ${channels}" name="Audio Samples"/>
+      <e txt="${metadata/Title}" name="Title"/>
+      <e txt="${metadata/Artist}" name="Artist"/>
+      <e txt="${metadata/Album}" name="Album"/>
+      <e txt="${metadata/Year}" name="Year"/>
+      <e txt="${metadata/Comment}" name="Comment"/>
+      <e txt="${metadata/Track}" name="Track"/>
+      <e txt="${metadata/Genre}" name="Genre"/>
+      <e txt="${metadata/Software}" name="Software"/>
 </pref>
 
 <cmdlist name="main" title="MPlayer OSD menu" ptr="<>" >
-- 
cgit v1.2.3