summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.c6
-rw-r--r--config.h4
-rw-r--r--frontend.c6
-rw-r--r--frontend_svr.c4
-rw-r--r--po/cs_CZ.po4
-rw-r--r--po/de_DE.po4
-rw-r--r--po/et_EE.po4
-rw-r--r--po/fi_FI.po6
-rw-r--r--po/it_IT.po4
-rw-r--r--po/ru_RU.po4
-rw-r--r--po/uk_UA.po4
-rw-r--r--po/zh_CN.po4
-rw-r--r--po/zh_TW.po4
-rw-r--r--setup_menu.c14
14 files changed, 38 insertions, 34 deletions
diff --git a/config.c b/config.c
index bc75016a..bdf79f7b 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c,v 1.96 2010-11-17 13:46:24 phintuka Exp $
+ * $Id: config.c,v 1.97 2010-12-17 13:07:52 phintuka Exp $
*
*/
@@ -532,7 +532,7 @@ config_t::config_t() {
memset(audio_equalizer,0,sizeof(audio_equalizer));
strn0cpy(audio_visualization, "goom", sizeof(audio_visualization));
strn0cpy(audio_vis_goom_opts, "fps:25,width:720,height:576", sizeof(audio_vis_goom_opts));
- strn0cpy(audio_vis_image_opts, "file:/usr/share/xine/visuals/default.avi", sizeof(audio_vis_image_opts));
+ strn0cpy(audio_vis_image_mrl, "file:/usr/share/xine/visuals/default.avi", sizeof(audio_vis_image_mrl));
headphone = 0;
audio_upmix = 0;
@@ -819,7 +819,7 @@ bool config_t::SetupParse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "Audio.Delay")) audio_delay = atoi(Value);
else if (!strcasecmp(Name, "Audio.Compression")) audio_compression = atoi(Value);
else if (!strcasecmp(Name, "Audio.Visualization.GoomOpts")) STRN0CPY(audio_vis_goom_opts, Value);
- else if (!strcasecmp(Name, "Audio.Visualization.ImageOpts")) STRN0CPY(audio_vis_image_opts, Value);
+ else if (!strcasecmp(Name, "Audio.Visualization.ImageMRL")) STRN0CPY(audio_vis_image_mrl, Value);
else if (!strcasecmp(Name, "Audio.Visualization")) STRN0CPY(audio_visualization, Value);
else if (!strcasecmp(Name, "Audio.Surround")) audio_surround = atoi(Value);
else if (!strcasecmp(Name, "Audio.Upmix")) audio_upmix = atoi(Value);
diff --git a/config.h b/config.h
index ec1ba6f3..825a3e04 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h,v 1.72 2010-05-30 23:24:12 phintuka Exp $
+ * $Id: config.h,v 1.73 2010-12-17 13:07:52 phintuka Exp $
*
*/
@@ -339,7 +339,7 @@ class config_t {
// Audio visualization
char audio_visualization[64];
char audio_vis_goom_opts[256];
- char audio_vis_image_opts[4096];
+ char audio_vis_image_mrl[4096];
// deinterlacing post plugin
char deinterlace_method[32];
diff --git a/frontend.c b/frontend.c
index fa2b620f..76792ffe 100644
--- a/frontend.c
+++ b/frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend.c,v 1.92 2010-11-17 13:59:22 phintuka Exp $
+ * $Id: frontend.c,v 1.93 2010-12-17 13:07:52 phintuka Exp $
*
*/
@@ -727,8 +727,8 @@ bool cXinelibThread::PlayFile(const char *FileName, int Position,
default:
if (xc.audio_vis_goom_opts[0] && !strcmp(xc.audio_visualization, "goom")) {
snprintf(vis, sizeof(vis), "%s:%s", xc.audio_visualization, xc.audio_vis_goom_opts);
- } else if (xc.audio_vis_image_opts[0] && !strcmp(xc.audio_visualization, "image")) {
- snprintf(vis, sizeof(vis), "%s:%s", xc.audio_visualization, xc.audio_vis_image_opts);
+ } else if (xc.audio_vis_image_mrl[0] && !strcmp(xc.audio_visualization, "image")) {
+ snprintf(vis, sizeof(vis), "%s:%s", xc.audio_visualization, xc.audio_vis_image_mrl);
} else {
strn0cpy(vis, xc.audio_visualization, sizeof(vis));
}
diff --git a/frontend_svr.c b/frontend_svr.c
index b92a2571..0c803d59 100644
--- a/frontend_svr.c
+++ b/frontend_svr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_svr.c,v 1.95 2010-07-09 21:31:37 phintuka Exp $
+ * $Id: frontend_svr.c,v 1.96 2010-12-17 13:07:52 phintuka Exp $
*
*/
@@ -1366,7 +1366,7 @@ void cXinelibServer::Handle_Control_HTTP(int cli, const char *arg)
if(pos)
file.Truncate(pos - m_FileName);
bool Allow = ( !strcmp_escaped(file, m_State[cli]->Uri() + 9)
- || !strcmp_escaped(xc.audio_vis_image_opts, m_State[cli]->Uri() + 9)
+ || !strcmp_escaped(xc.audio_vis_image_mrl, m_State[cli]->Uri() + 9)
|| (pos && !strcmp_escaped(pos + 10, m_State[cli]->Uri() + 9)));
if(Allow) {
LOGMSG("HTTP streaming media file");
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0e78f18b..f2d841da 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2008-03-20 23:57+0100\n"
"Last-Translator: Maya <maja373@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -354,7 +354,7 @@ msgstr "Rychlost"
msgid "fps"
msgstr "snmk/sek."
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/de_DE.po b/po/de_DE.po
index 5b5ed9f6..dfb17f8a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2007-11-23 10:17+0200\n"
"Last-Translator: Udo Richter\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -353,7 +353,7 @@ msgstr "Bildrate"
msgid "fps"
msgstr ""
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/et_EE.po b/po/et_EE.po
index 55d9137f..4d6f777d 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2008-10-06 11:19+0200\n"
"Last-Translator: Arthur Konovalov\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -353,7 +353,7 @@ msgstr "Kiirus"
msgid "fps"
msgstr "fps"
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0590983c..457ea9ca 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2008-10-06 11:19+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -354,8 +354,8 @@ msgstr "Nopeus"
msgid "fps"
msgstr "fps"
-msgid "Background image"
-msgstr "Taustakuva"
+msgid "Background image MRL"
+msgstr "Taustakuvan MRL"
msgid "Audio Equalizer"
msgstr "Taajuuskorjain"
diff --git a/po/it_IT.po b/po/it_IT.po
index c296d27c..cd0a34c2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2010-03-06 18:07+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -355,7 +355,7 @@ msgstr "Velocità"
msgid "fps"
msgstr "fps"
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index ba1f96cc..a48485ee 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2007-11-23 10:17+0200\n"
"Last-Translator: Vladimir Monchenko\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -353,7 +353,7 @@ msgstr ""
msgid "fps"
msgstr ""
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 70d1cf74..18050be9 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2010-05-05 19:16+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -356,7 +356,7 @@ msgstr "Швидкість"
msgid "fps"
msgstr "кадр за сек"
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 21bd9dc3..b48a52ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2009-09-21 23:32+0800\n"
"Last-Translator: NanFeng <nfgx@21cn.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -353,7 +353,7 @@ msgstr "速度"
msgid "fps"
msgstr "帧"
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 73fe4efb..97c7d951 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2010-11-17 15:04+0200\n"
+"POT-Creation-Date: 2010-12-17 14:54+0200\n"
"PO-Revision-Date: 2009-09-21 23:32+0800\n"
"Last-Translator: NanFeng <nfgx@21cn.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -356,7 +356,7 @@ msgstr "速度"
msgid "fps"
msgstr "幀"
-msgid "Background image"
+msgid "Background image MRL"
msgstr ""
msgid "Audio Equalizer"
diff --git a/setup_menu.c b/setup_menu.c
index 5a6011be..9131f8be 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: setup_menu.c,v 1.78 2010-11-17 13:49:28 phintuka Exp $
+ * $Id: setup_menu.c,v 1.79 2010-12-17 13:07:52 phintuka Exp $
*
*/
@@ -20,6 +20,7 @@
#include "menuitems.h"
#include "osd.h" // cXinelibOsdProvider::RefreshOsd()
#include "setup_menu.h"
+#include "tools/playlist.h"
#define indent(x) Label_Ident(x)
#define inden2(x) Label_Ident(Label_Ident(x))
@@ -213,9 +214,9 @@ void cMenuSetupAudio::Set(void)
Add(new cMenuEditTypedIntItem(indent(tr("Speed")), tr("fps"),
&goom_fps, 1, 100));
} else if(visualization == AUDIO_VIS_IMAGE) {
- Add(new cMenuEditStrItem(indent(tr("Background image")),
- newconfig.audio_vis_image_opts,
- sizeof(newconfig.audio_vis_image_opts)));
+ Add(new cMenuEditStrItem(indent(tr("Background image MRL")),
+ newconfig.audio_vis_image_mrl,
+ sizeof(newconfig.audio_vis_image_mrl)));
}
if(current<1) current=1; /* first item is not selectable */
@@ -299,6 +300,9 @@ void cMenuSetupAudio::Store(void)
goom_width, goom_height, goom_fps);
xc.audio_vis_goom_opts[sizeof(xc.audio_vis_goom_opts)-1] = 0;
+ if(xc.audio_vis_image_mrl[0] == '/')
+ snprintf(xc.audio_vis_image_mrl, sizeof(xc.audio_vis_image_mrl), "%s", *cPlaylist::BuildMrl("file", xc.audio_vis_image_mrl));
+
SetupStore("Audio.Speakers", xc.s_speakerArrangements[xc.speaker_type]);
SetupStore("Audio.Delay", xc.audio_delay);
SetupStore("Audio.Compression", xc.audio_compression);
@@ -307,7 +311,7 @@ void cMenuSetupAudio::Store(void)
SetupStore("Audio.Headphone", xc.headphone);
SetupStore("Audio.Visualization",xc.audio_visualization);
SetupStore("Audio.Visualization.GoomOpts",xc.audio_vis_goom_opts);
- SetupStore("Audio.Visualization.ImageOpts",xc.audio_vis_image_opts);
+ SetupStore("Audio.Visualization.ImageMRL",xc.audio_vis_image_mrl);
SetupStore("Audio.SoftwareVolumeControl", xc.sw_volume_control);
Setup.Save();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 20:01:20 +0000