Mercurial > mplayer.hg

changeset 23398:69bf352bcef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop the metadata stuff and replace it with generic property string expansion.
author albeu
date Wed, 30 May 2007 07:07:32 +0000
parents 1d807885ce7b
children 8a0062b81dcc
files etc/menu.conf help/help_mp-en.h libmenu/menu_param.c
diffstat 3 files changed, 38 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/etc/menu.conf	Wed May 30 07:05:34 2007 +0000
+++ b/etc/menu.conf	Wed May 30 07:07:32 2007 +0000
@@ -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="<>" >
--- a/help/help_mp-en.h	Wed May 30 07:05:34 2007 +0000
+++ b/help/help_mp-en.h	Wed May 30 07:07:32 2007 +0000
@@ -1606,7 +1606,8 @@
 
 // libmenu/menu_param.c
 #define MSGTR_LIBMENU_SubmenuDefinitionNeedAMenuAttribut "[MENU] Submenu definition needs a 'menu' attribute.\n"
-#define MSGTR_LIBMENU_PrefMenuEntryDefinitionsNeed "[MENU] Pref menu entry definitions need a valid 'property' attribute (line %d).\n"
+#define MSGTR_LIBMENU_InvalidProperty "[MENU] Invalid property '%s' in pref menu entry. (line %d).\n"
+#define MSGTR_LIBMENU_PrefMenuEntryDefinitionsNeed "[MENU] Pref menu entry definitions need a valid 'property' or 'txt' attribute (line %d).\n"
 #define MSGTR_LIBMENU_PrefMenuNeedsAnArgument "[MENU] Pref menu needs an argument.\n"
 
 // libmenu/menu_pt.c
--- a/libmenu/menu_param.c	Wed May 30 07:05:34 2007 +0000
+++ b/libmenu/menu_param.c	Wed May 30 07:07:32 2007 +0000
@@ -25,11 +25,12 @@
 #include "menu_list.h"
 #include "input/input.h"
 #include "osdep/keycodes.h"
-#include "metadata.h"
+#include "command.h"
 
 struct list_entry_s {
   struct list_entry p;
   char* name;
+  char* txt;
   char* prop;
   m_option_t* opt;
   char* menu;
@@ -62,25 +63,12 @@
 
 #define mpriv (menu->priv)
 
-#define OPT_NAME "name"
-#define OPT_VCODEC "vcodec"
-#define OPT_VBITRATE "vbitrate"
-#define OPT_RESOLUTION "resolution"
-#define OPT_ACODEC "acodec"
-#define OPT_ABITRATE "abitrate"
-#define OPT_SAMPLES "asamples"
-#define OPT_INFO_TITLE "title"
-#define OPT_INFO_ARTIST "artist"
-#define OPT_INFO_ALBUM "album"
-#define OPT_INFO_YEAR "year"
-#define OPT_INFO_COMMENT "comment"
-#define OPT_INFO_TRACK "track"
-#define OPT_INFO_GENRE "genre"
-
 static void entry_set_text(menu_t* menu, list_entry_t* e) {
-  char* val = mp_property_print(e->prop, menu->ctx);
+  char* val = e->txt ? property_expand_string(menu->ctx, e->txt) :
+    mp_property_print(e->prop, menu->ctx);
   int l,edit = (mpriv->edit && e == mpriv->p.current);
-  if(!val) {
+  if(!val || !val[0]) {
+    if(val) free(val);
     if(mpriv->hide_na) {
       e->p.hide = 1;
       return;
@@ -98,11 +86,11 @@
 static void update_entries(menu_t* menu) {
   list_entry_t* e;
   for(e = mpriv->p.menu ; e ; e = e->p.next)
-    if(e->prop) entry_set_text(menu,e);
+    if(e->txt || e->prop) entry_set_text(menu,e);
 }
 
 static int parse_args(menu_t* menu,char* args) {
-  char *element,*body, **attribs, *name, *meta, *val;
+  char *element,*body, **attribs, *name, *txt;
   list_entry_t* m = NULL;
   int r;
   m_option_t* opt;
@@ -139,70 +127,25 @@
       goto next_element;
     }
 
-    meta = asx_get_attrib("meta",attribs);
-    val = NULL;
-    if(meta) {
-      if (!strcmp (meta, OPT_NAME))
-        val = get_metadata (META_NAME);
-      else if (!strcmp (meta, OPT_VCODEC))
-        val = get_metadata (META_VIDEO_CODEC);
-      else if (!strcmp(meta, OPT_VBITRATE))
-        val = get_metadata (META_VIDEO_BITRATE);
-      else if(!strcmp(meta, OPT_RESOLUTION))
-      val = get_metadata (META_VIDEO_RESOLUTION);
-      else if (!strcmp(meta, OPT_ACODEC))
-        val = get_metadata (META_AUDIO_CODEC);
-      else if(!strcmp(meta, OPT_ABITRATE))
-        val = get_metadata (META_AUDIO_BITRATE);
-      else if(!strcmp(meta, OPT_SAMPLES))
-        val = get_metadata (META_AUDIO_SAMPLES);
-      else if (!strcmp (meta, OPT_INFO_TITLE))
-        val = get_metadata (META_INFO_TITLE);
-      else if (!strcmp (meta, OPT_INFO_ARTIST))
-        val = get_metadata (META_INFO_ARTIST);
-      else if (!strcmp (meta, OPT_INFO_ALBUM))
-        val = get_metadata (META_INFO_ALBUM);
-      else if (!strcmp (meta, OPT_INFO_YEAR))
-        val = get_metadata (META_INFO_YEAR);
-      else if (!strcmp (meta, OPT_INFO_COMMENT))
-        val = get_metadata (META_INFO_COMMENT);
-      else if (!strcmp (meta, OPT_INFO_TRACK))
-        val = get_metadata (META_INFO_TRACK);
-      else if (!strcmp (meta, OPT_INFO_GENRE))
-      val = get_metadata (META_INFO_GENRE);
-    if (val) {
-      char *item = asx_get_attrib("name",attribs);
-      int l;
-
-      if (!item)
-        item = strdup (meta);
-      l = strlen(item) + 2 + strlen(val) + 1;
-      m = calloc(1,sizeof(struct list_entry_s));
-      m->p.txt = malloc(l);
-      sprintf(m->p.txt,"%s: %s",item,val);
-      free(val);
-      free(item);
-      menu_list_add_entry(menu,m);
+    name = asx_get_attrib("property",attribs);
+    opt = NULL;
+    if(name && mp_property_do(name,M_PROPERTY_GET_TYPE,&opt,menu->ctx) <= 0) {
+      mp_msg(MSGT_OSD_MENU,MSGL_WARN,MSGTR_LIBMENU_InvalidProperty,
+             name,parser->line);
+      goto next_element;
     }
-    free (meta);
-    if (element)
-      free(element);
-    if(body)
-      free(body);
-    asx_free_attribs(attribs);
-    continue;
-    }
-    
-    name = asx_get_attrib("property",attribs);
-    if(!name || mp_property_do(name,M_PROPERTY_GET_TYPE,&opt,menu->ctx) <= 0) {
+    txt = asx_get_attrib("txt",attribs);
+    if(!(name || txt)) {
       mp_msg(MSGT_OSD_MENU,MSGL_WARN,MSGTR_LIBMENU_PrefMenuEntryDefinitionsNeed,parser->line);
+      if(txt) free(txt), txt = NULL;
       goto next_element;
     }
     m = calloc(1,sizeof(struct list_entry_s));
     m->opt = opt;
-    m->prop = strdup(name);
+    m->txt = txt; txt = NULL;
+    m->prop = name; name = NULL;
     m->name = asx_get_attrib("name",attribs);
-    if(!m->name) m->name = strdup(opt->name);
+    if(!m->name) m->name = strdup(opt ? opt->name : "-");
     entry_set_text(menu,m);
     menu_list_add_entry(menu,m);
 
@@ -290,6 +233,7 @@
 static void free_entry(list_entry_t* entry) {
   free(entry->p.txt);
   if(entry->name) free(entry->name);
+  if(entry->txt)  free(entry->txt);
   if(entry->prop) free(entry->prop);
   if(entry->menu) free(entry->menu);
   free(entry);