[vlc-devel] commit: upnp_intel: fix compilation. ( Rémi Duraffort )

git version control git at videolan.org
Fri Aug 29 21:14:14 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Aug 29 21:16:46 2008 +0200| [0210d3064cdcda689aa56f755c82c58d69d99060] | committer: Rémi Duraffort 

upnp_intel: fix compilation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0210d3064cdcda689aa56f755c82c58d69d99060
---

 modules/services_discovery/upnp_intel.cpp |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index 5bfef20..721615f 100644
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -260,6 +260,19 @@ private:
 };
 
 
+
+// VLC handle
+
+struct services_discovery_sys_t
+{
+    playlist_t *p_playlist;
+    playlist_item_t *p_node_cat;
+    playlist_item_t *p_node_one;
+    Cookie cookie;
+};
+
+
+
 // VLC callback prototypes
 
 static playlist_t *pl_Get( services_discovery_t *p_sd )
@@ -267,6 +280,8 @@ static playlist_t *pl_Get( services_discovery_t *p_sd )
     return p_sd->p_sys->p_playlist;
 }
 
+
+
 // More prototypes...
 
 static int Callback( Upnp_EventType eventType, void* event, void* pCookie );
@@ -276,16 +291,6 @@ IXML_Document* parseBrowseResult( IXML_Document* doc );
 
 
 
-// VLC handle
-
-struct services_discovery_sys_t
-{
-    playlist_t *p_playlist;
-    playlist_item_t *p_node_cat;
-    playlist_item_t *p_node_one;
-    Cookie cookie;
-};
-
 // VLC callbacks...
 
 static int Open( vlc_object_t *p_this )
@@ -296,6 +301,7 @@ static int Open( vlc_object_t *p_this )
 
     p_sd->p_sys = p_sys;
     p_sys->p_playlist = pl_Yield( p_sd );
+    Cookie cookie = p_sys->cookie;
 
     /* Create our playlist node */
     vlc_object_lock( p_sys->p_playlist );




More information about the vlc-devel mailing list