summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-08-16 22:23:04 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-08-16 22:23:04 +0000
commitd8fb1c2c2e2b1457a4962b6d1ac41142c991da77 (patch)
tree2434273e7d6f5e5baf349ce5dad37d7dea3f2c7a
parent118a93dc8c693874d17b324ac7f29b03af6f5ea6 (diff)
downloadtotem-d8fb1c2c2e2b1457a4962b6d1ac41142c991da77.tar.gz
Only go "audioonly" if the controller is shown, even if we're smaller than
2007-08-16 Bastien Nocera <hadess@hadess.net> * browser-plugin/totemPlugin.cpp: Only go "audioonly" if the controller is shown, even if we're smaller than the minimum size (Closes: #424784) svn path=/trunk/; revision=4536
-rw-r--r--ChangeLog6
-rw-r--r--browser-plugin/totemPlugin.cpp24
2 files changed, 19 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dbbe5fad..b693142ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-16 Bastien Nocera <hadess@hadess.net>
+ * browser-plugin/totemPlugin.cpp: Only go "audioonly" if the
+ controller is shown, even if we're smaller than the minimum
+ size (Closes: #424784)
+
+2007-08-16 Bastien Nocera <hadess@hadess.net>
+
* browser-plugin/totem-plugin-viewer.c:
(totem_embedded_open_playlist_item),
(totem_embedded_parse_duration), (entry_parsed):
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index 6f1efbf64..73c494389 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -1639,17 +1639,6 @@ totemPlugin::Init (NPMIMEType mimetype,
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 */
-#if defined(TOTEM_NARROWSPACE_PLUGIN) || defined (TOTEM_BASIC_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.
*/
@@ -1808,6 +1797,19 @@ totemPlugin::Init (NPMIMEType mimetype,
//FIXME handle starttime and endtime
// http://www.htmlcodetutorial.com/embeddedobjects/_EMBED_STARTTIME.html
+ /* Minimum heights of the different plugins, note that the
+ * controllers need to be showing, otherwise it's useless */
+#ifdef TOTEM_GMP_PLUGIN
+ if (height == 40 && !mControllerHidden) {
+ mAudioOnly = PR_TRUE;
+ }
+#endif /* TOTEM_GMP_PLUGIN */
+#if defined(TOTEM_NARROWSPACE_PLUGIN) || defined (TOTEM_BASIC_PLUGIN)
+ if (height <= 16 && !mControllerHidden) {
+ mAudioOnly = PR_TRUE;
+ }
+#endif /* TOTEM_NARROWSPACE_PLUGIN */
+
#ifdef TOTEM_NARROWSPACE_PLUGIN
/* We need to autostart if we're using an HREF
* otherwise the start image isn't shown */