[meego-commits] 24880: Changes to devel:tv:1.2/UMMS

[jkwu]

Hi,
I have made the following changes to UMMS in project devel:tv:1.2. Please review and accept ASAP.

Thank You,
jkwu

[This message was auto-generated]

---

Request #24880:

  submit:   home:jkwu:branches:MeeGo:1.2:oss/UMMS(r2) -> devel:tv:1.2/UMMS


Message:
    - commit 93e58f89f731d6cf942ea04ec74ec1a759be0e12
- Author: Alex Wu <zhiwen.wu at linux.intel.com>
- Date:   Thu May 3 16:52:55 2012 +0800
    umms.conf: Fix set a invalid proxy uri.
    
    Because UMMS core will use the proxy setting in umms.conf instead
    of the proxy by SetProxy method call. The default umms.conf provides
    a invalid proxy uri, that makes SetProxy method take no effects.
    Also add a checking for "" string.
- commit d8fdc2ab1f39521c7087963284f37a596de2d884
- Author: Alex Wu <zhiwen.wu at linux.intel.com>
- Date:   Wed Apr 25 09:07:59 2012 +0800
    UmmsMediaPlayer: Emit Initialized signal when going up to Paused
    
    The semantic of Initialized signal is backend has got enough media
    data and been ready for query media matadata.

State:   new          2012-05-10T21:25:46 jkwu
Comment: None



changes files:
--------------
--- umms.changes
+++ umms.changes
@@ -1,0 +2,24 @@
+Fri May 11 05:18:34 UTC 2012 - jieke.wu at intel.com
+
+- commit 93e58f89f731d6cf942ea04ec74ec1a759be0e12
+- Author: Alex Wu <zhiwen.wu at linux.intel.com>
+- Date:   Thu May 3 16:52:55 2012 +0800
+
+    umms.conf: Fix set a invalid proxy uri.
+    
+    Because UMMS core will use the proxy setting in umms.conf instead
+    of the proxy by SetProxy method call. The default umms.conf provides
+    a invalid proxy uri, that makes SetProxy method take no effects.
+    Also add a checking for "" string.
+
+- commit d8fdc2ab1f39521c7087963284f37a596de2d884
+- Author: Alex Wu <zhiwen.wu at linux.intel.com>
+- Date:   Wed Apr 25 09:07:59 2012 +0800
+
+    UmmsMediaPlayer: Emit Initialized signal when going up to Paused
+    
+    The semantic of Initialized signal is backend has got enough media
+    data and been ready for query media matadata.
+ 
+
+-------------------------------------------------------------------

spec files:
-----------

other changes:
--------------

++++++ umms-0.1.tar.gz
--- src/umms-media-player.c
+++ src/umms-media-player.c
@@ -174,6 +174,8 @@
 player_state_changed_cb (UmmsPlayerBackend *iface, gint old_state, gint new_state, UmmsMediaPlayer *player)
 {
   g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_PlayerStateChanged], 0, old_state, new_state);
+  if (new_state == PlayerStatePaused && old_state < PlayerStatePaused)
+    g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_Initialized], 0);
 }
 
 static void
@@ -361,7 +363,7 @@
     umms_player_backend_set_video_size (priv->backend, priv->x, priv->y, priv->w, priv->h, NULL);
   priv->video_size_cached = FALSE;
 
-  if (umms_ctx->proxy_uri) {
+  if (umms_ctx->proxy_uri && umms_ctx->proxy_uri[0] != '\0') {
     if (priv->http_proxy_params)
       g_hash_table_unref (priv->http_proxy_params);
     priv->http_proxy_params = param_table_create ("proxy-uri", G_TYPE_STRING, umms_ctx->proxy_uri,
@@ -378,8 +380,6 @@
   if (priv->sub_uri)
     umms_player_backend_set_subtitle_uri (priv->backend, priv->sub_uri, NULL);
 
-  g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_Initialized], 0);
-
   return TRUE;
 }
 
--- umms.conf
+++ umms.conf
@@ -14,6 +14,6 @@
 
 [Proxy]
 #section to specify the proxy
-uri = http://host:port
-user = 
-password = 
+#uri = 
+#user = 
+#password =