summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--browser-plugin/totem-plugin-viewer-options.h1
-rw-r--r--browser-plugin/totem-plugin-viewer.c6
-rw-r--r--browser-plugin/totemNarrowSpacePlugin.cpp3
-rw-r--r--browser-plugin/totemPlugin.cpp21
-rw-r--r--browser-plugin/totemPlugin.h1
-rw-r--r--po/ChangeLog4
-rw-r--r--po/POTFILES.in3
-rw-r--r--src/totem-interface.c4
9 files changed, 50 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b96eb9513..4221b62bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-01-10 Bastien Nocera <hadess@hadess.net>
+
+ * browser-plugin/totem-plugin-viewer-options.h:
+ * browser-plugin/totem-plugin-viewer.c: (totem_embedded_construct),
+ (main):
+ * browser-plugin/totemPlugin.cpp:
+ * browser-plugin/totemPlugin.h: add support for "audio only"
+ outputs (Closes: #395078)
+
+ * browser-plugin/totemNarrowSpacePlugin.cpp:
+ remove unused audio/x-mpegurl mime-type
+
+ * src/totem-interface.c: (totem_interface_get_license):
+ Remove mention of Sound Juicer completely (Closes: #395154)
+
2007-01-10 Tim-Philipp Müller <tim at centricular dot net>
* README:
diff --git a/browser-plugin/totem-plugin-viewer-options.h b/browser-plugin/totem-plugin-viewer-options.h
index 0bd595513..a97b07797 100644
--- a/browser-plugin/totem-plugin-viewer-options.h
+++ b/browser-plugin/totem-plugin-viewer-options.h
@@ -35,5 +35,6 @@
#define TOTEM_OPTION_REPEAT "repeat"
#define TOTEM_OPTION_USER_AGENT "user-agent"
#define TOTEM_OPTION_STATUSBAR "statusbar"
+#define TOTEM_OPTION_AUDIOONLY "audio-only"
#endif /* !__TOTEM_PLUGIN_VIEWER_OPTIONS_H__ */
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 9b688cd0b..6903b9fc3 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -136,6 +136,7 @@ typedef struct _TotemEmbedded {
guint seeking : 1;
guint noautostart : 1;
guint autostart : 1;
+ guint audioonly : 1;
} TotemEmbedded;
GType totem_embedded_get_type (void);
@@ -1311,7 +1312,7 @@ totem_embedded_construct (TotemEmbedded *emb,
emb->window = glade_xml_get_widget (emb->xml, "window");
}
- if (emb->hidden)
+ if (emb->hidden || emb->audioonly != FALSE)
type = BVW_USE_TYPE_AUDIO;
else
type = BVW_USE_TYPE_VIDEO;
@@ -1653,6 +1654,7 @@ static gboolean arg_hidden = FALSE;
static gboolean arg_is_playlist = FALSE;
static gboolean arg_repeat = FALSE;
static gboolean arg_no_autostart = FALSE;
+static gboolean arg_audioonly = FALSE;
static TotemPluginType arg_plugin_type = TOTEM_PLUGIN_TYPE_LAST;
static gboolean
@@ -1692,6 +1694,7 @@ static GOptionEntry option_entries [] =
{ TOTEM_OPTION_PLAYLIST, 0, 0, G_OPTION_ARG_NONE, &arg_is_playlist, NULL, NULL },
{ TOTEM_OPTION_REPEAT, 0, 0, G_OPTION_ARG_NONE, &arg_repeat, NULL, NULL },
{ TOTEM_OPTION_NOAUTOSTART, 0, 0, G_OPTION_ARG_NONE, &arg_no_autostart, NULL, NULL },
+ { TOTEM_OPTION_AUDIOONLY, 0, 0, G_OPTION_ARG_NONE, &arg_audioonly, NULL, NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY /* STRING? */, &arg_remaining, NULL },
{ NULL }
};
@@ -1834,6 +1837,7 @@ int main (int argc, char **argv)
emb->is_playlist = arg_is_playlist;
emb->repeat = arg_repeat;
emb->autostart = !arg_no_autostart;
+ emb->audioonly = arg_audioonly;
emb->type = arg_plugin_type;
/* FIXME: register this BEFORE requesting the service name? */
diff --git a/browser-plugin/totemNarrowSpacePlugin.cpp b/browser-plugin/totemNarrowSpacePlugin.cpp
index c3bae81dd..67eccbcb8 100644
--- a/browser-plugin/totemNarrowSpacePlugin.cpp
+++ b/browser-plugin/totemNarrowSpacePlugin.cpp
@@ -50,8 +50,7 @@ static const totemPluginMimeEntry kMimeTypes[] = {
{ "video/quicktime", "mov", NULL, FALSE },
{ "video/mp4", "mp4", NULL, FALSE },
{ "image/x-macpaint", "pntg", NULL, FALSE },
- { "image/x-quicktime", "pict, pict1, pict2", "image/x-pict", FALSE },
- { "audio/x-mpegurl", "m3u", NULL, TRUE }
+ { "image/x-quicktime", "pict, pict1, pict2", "image/x-pict", FALSE }
};
totemScriptablePlugin::totemScriptablePlugin (totemPlugin *aPlugin)
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index f56705799..c01f5ab76 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -306,6 +306,10 @@ totemPlugin::ViewerFork ()
g_ptr_array_add (arr, g_strdup (DASHES TOTEM_OPTION_REPEAT));
}
+ if (mAudioOnly) {
+ g_ptr_array_add (arr, g_strdup (DASHES TOTEM_OPTION_AUDIOONLY));
+ }
+
if (!mAutostart) {
g_ptr_array_add (arr, g_strdup (DASHES TOTEM_OPTION_NOAUTOSTART));
}
@@ -1650,18 +1654,28 @@ totemPlugin::Init (NPMIMEType mimetype,
if (value != NULL) {
height = strtol (value, NULL, 0);
}
-
+
/* Are we hidden? */
/* Treat hidden without a value as TRUE */
mHidden = g_hash_table_lookup (args, "hidden") != NULL &&
GetBooleanValue (args, "hidden", PR_TRUE);
+#ifdef TOTEM_GMP_PLUGIN
+ if (height == 40) {
+ mAudioOnly = PR_TRUE;
+ }
+#endif /* TOTEM_GMP_PLUGIN */
+#ifdef TOTEM_NARROWSPACE_PLUGIN
+ if (height <= 16) {
+ mAudioOnly = PR_TRUE;
+ }
+#endif /* TOTEM_NARROWSPACE_PLUGIN */
+
/* Most for RealAudio streams, but also used as a replacement for
* HIDDEN=TRUE attribute.
*/
- if (width == 0 && height == 0) {
+ if (width == 0 && height == 0)
mHidden = PR_TRUE;
- }
/* Whether to automatically stream and play the content */
mAutostart = GetBooleanValue (args, "autoplay",
@@ -1822,6 +1836,7 @@ totemPlugin::Init (NPMIMEType mimetype,
D ("mControllerHidden: %d", mControllerHidden);
D ("mShowStatusbar: %d", mShowStatusbar);
D ("mHidden: %d", mHidden);
+ D ("mAudioOnly: %s", mAudioOnly);
D ("mAutostart: %d, mRepeat: %d", mAutostart, mRepeat);
#ifdef TOTEM_NARROWSPACE_PLUGIN
D ("mHref: %s", mHref.get ());
diff --git a/browser-plugin/totemPlugin.h b/browser-plugin/totemPlugin.h
index 7d89ff3c4..e730590f6 100644
--- a/browser-plugin/totemPlugin.h
+++ b/browser-plugin/totemPlugin.h
@@ -272,6 +272,7 @@ class totemPlugin {
PRUint32 mViewerSetUp : 1;
PRUint32 mWaitingForButtonPress : 1;
PRUint32 mWindowSet : 1;
+ PRUint32 mAudioOnly : 1;
};
typedef struct {
diff --git a/po/ChangeLog b/po/ChangeLog
index 85688c089..1b59e4e8e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-10 Bastien Nocera <hadess@hadess.net>
+
+ * POTFILES.in: add missing files (Closes: #395154)
+
2007-01-09 Daniel Nylander <po@danielnylander.se>
* sv.po: Updated Swedish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 436fd62b4..fd2fbf740 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,4 +36,7 @@ src/backend/bacon-video-widget-xine.c
src/backend/video-utils.c
src/plparse/totem-disc.c
src/plparse/totem-pl-parser.c
+src/plparse/totem-pl-parser-lines.c
+src/plparse/totem-pl-parser-pls.c
+src/plparse/totem-pl-parser-xspf.c
browser-plugin/totem-plugin-viewer.c
diff --git a/src/totem-interface.c b/src/totem-interface.c
index 53d5c0313..2711c332e 100644
--- a/src/totem-interface.c
+++ b/src/totem-interface.c
@@ -237,12 +237,12 @@ totem_interface_get_license (void)
"it under the terms of the GNU General Public License as published by "
"the Free Software Foundation; either version 2 of the License, or "
"(at your option) any later version."),
- N_("Sound Juicer is distributed in the hope that it will be useful, "
+ N_("Totem is distributed in the hope that it will be useful, "
"but WITHOUT ANY WARRANTY; without even the implied warranty of "
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
"GNU General Public License for more details."),
N_("You should have received a copy of the GNU General Public License "
- "along with Sound Juicer; if not, write to the Free Software Foundation, Inc., "
+ "along with Totem; if not, write to the Free Software Foundation, Inc., "
"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"),
N_("Totem contains an exception to allow the use of proprietary "
"GStreamer plugins.")
View Lorry Controller Status