dlna: fix typos

5 files changed, 25 insertions, 41 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f5d5893..93216e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,14 +3,14 @@ NULL =
 public_headers = \
 		utils.h \
 		user_interface.h \
-		mpris.h
+		dlna.h \
 		gst_engine.h \
 		screensaver.h
 
 c_sources = \
 	utils.c \
 	user_interface.c \
-	mpris.c \
+	dlna.c \
 	gst_engine.c \
 	screensaver.c \
 	snappy.c
diff --git a/src/mpris.c b/src/dlna.c
index 0559954..20ed99a 100644
--- a/src/mpris.c
+++ b/src/dlna.c
@@ -23,7 +23,7 @@
 #include <gio/gio.h>
 #include <stdlib.h>
 
-#include "mpris.h"
+#include "dlna.h"
 
 const char *mpris_introspection_xml =
 	"<node>"
@@ -145,7 +145,7 @@ G_DEFINE_TYPE (SnappyMP, my_object, G_TYPE_OBJECT);
 static void
 my_object_init (SnappyMP * object)
 {
-  g_print ("my_object_init\n");
+  // g_print ("my_object_init\n");
 
   object->name = "snappy";
 }
@@ -168,8 +168,6 @@ my_object_get_property (GObject * object,
 {
   SnappyMP *myobj = (SnappyMP *) object;
 
-  g_print ("my_object_get_property\n");
-
   switch (prop_id) {
     case PROP_NAME:
       g_value_set_string (value, myobj->name);
@@ -188,8 +186,6 @@ my_object_set_property (GObject * object,
 {
   SnappyMP *myobj = (SnappyMP *) object;
 
-  g_print ("my_object_set_property\n");
-
   switch (prop_id) {
     case PROP_NAME:
       g_free (myobj->name);
@@ -206,8 +202,6 @@ my_object_class_init (SnappyMPClass * class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-  g_print ("my_object_class_init\n");
-
   gobject_class->finalize = my_object_finalize;
   gobject_class->set_property = my_object_set_property;
   gobject_class->get_property = my_object_get_property;
@@ -232,15 +226,13 @@ my_object_class_init (SnappyMPClass * class)
 void
 my_object_change_uri (SnappyMP * myobj, gchar * uri)
 {
-  g_print ("my_object_change_uri\n");
-  if (myobj == NULL)
-    g_print ("object is NULL\n");
-  myobj->uri = uri;
+  if (myobj != NULL)
+    myobj->uri = uri;
 
-  g_print ("changing uri: %s\n", uri);
-  g_object_set (G_OBJECT (myobj), "uri", uri, NULL);
+    // g_print ("changing uri: %s\n", uri);
+    g_object_set (G_OBJECT (myobj), "uri", uri, NULL);
 
-  engine_open_uri (myobj->engine, uri);
+    engine_open_uri (myobj->engine, uri);
 }
 
 static void
@@ -252,11 +244,11 @@ handle_result (GDBusMethodInvocation * invocation,
     g_dbus_method_invocation_return_value (invocation, NULL);
   } else {
     if (error != NULL) {
-      g_print ("returning error: %s", error->message);
+      g_print ("DLNA returning error: %s", error->message);
       g_dbus_method_invocation_return_gerror (invocation, error);
       g_error_free (error);
     } else {
-      g_print ("returning unknown error");
+      g_print ("DLNA returning unknown error");
       g_dbus_method_invocation_return_error_literal (invocation,
           G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Unknown error");
     }
@@ -276,7 +268,7 @@ handle_method_call (GDBusConnection * connection,
   gboolean ret = TRUE;
   GError *error = NULL;
 
-  g_print ("handle_method_call: %s\n", method_name);
+  // g_print ("handle_method_call: %s\n", method_name);
 
   if (g_strcmp0 (object_path, MPRIS_OBJECT_NAME) != 0 ||
       g_strcmp0 (interface_name, MPRIS_PLAYER_INTERFACE) != 0) {
@@ -392,8 +384,6 @@ handle_set_property (GDBusConnection * connection,
 {
   SnappyMP *myobj = user_data;
 
-  g_print ("handle_set_property\n");
-
   if (g_strcmp0 (property_name, "Name") == 0) {
     g_object_set (myobj, "name", g_variant_get_string (value, NULL), NULL);
   }
@@ -438,7 +428,7 @@ get_root_property (GDBusConnection * connection,
     const char *interface_name,
     const char *property_name, GError ** error, SnappyMP * mp)
 {
-  g_print ("get_root_property: %s\n", property_name);
+  // g_print ("get_root_property: %s\n", property_name);
 
   if (g_strcmp0 (object_path, MPRIS_OBJECT_NAME) != 0 ||
       g_strcmp0 (interface_name, MPRIS_ROOT_INTERFACE) != 0) {
@@ -488,7 +478,6 @@ send_property_change (GObject * obj,
     GParamSpec * pspec,
     GDBusConnection * connection)
 {
-  g_print ("send_property_change\n");
 
   GVariantBuilder *builder;
   GVariantBuilder *invalidated_builder;
@@ -501,7 +490,7 @@ send_property_change (GObject * obj,
     g_variant_builder_add (builder,
         "{sv}", "Name", g_variant_new_string (myobj->name ? myobj->name : ""));
 
-  g_print ("some property changed %s\n", pspec->name);
+  // g_print ("some property changed %s\n", pspec->name);
 
   g_dbus_connection_emit_signal (connection,
       NULL,
@@ -517,7 +506,7 @@ on_name_acquired (GDBusConnection * connection,
     const gchar * name,
     gpointer user_data)
 {
-  g_print ("on_name_acquired\n");
+  // g_print ("DLNA MediaPlayer name acquired.\n");
 }
 
 static void
@@ -529,7 +518,7 @@ on_name_lost (GDBusConnection * connection,
 }
 
 gboolean
-load_mpris (SnappyMP *mp)
+load_dlna (SnappyMP *mp)
 {
   guint owner_id, player_id, root_id;
   GError *error = NULL;
@@ -579,7 +568,7 @@ load_mpris (SnappyMP *mp)
 }
 
 gboolean
-close_mpris (SnappyMP *mp)
+close_dlna (SnappyMP *mp)
 {
   g_bus_unown_name (mp->owner_id);
 
diff --git a/src/mpris.h b/src/dlna.h
index dd290b7..159c62f 100644
--- a/src/mpris.h
+++ b/src/dlna.h
@@ -20,8 +20,8 @@
  * USA
  */
 
-#ifndef __MPRIS_H__
-#define __MPRIS_H__
+#ifndef __DLNA_H__
+#define __DLNA_H__
 
 #include <gio/gio.h>
 #include <glib-object.h>
@@ -100,8 +100,8 @@ static guint
 mediaplayer_signals[LAST_SIGNAL] = { 0 };
 
 // Declaration of non-static functions
-gboolean load_mpris (SnappyMP *mp_obj);
-gboolean close_mpris (SnappyMP *mp_obj);
+gboolean load_dlna (SnappyMP *mp_obj);
+gboolean close_dlna (SnappyMP *mp_obj);
 
 void handle_method_call (GDBusConnection * connection,
     const gchar * sender,
@@ -140,4 +140,4 @@ GVariant * get_root_property (GDBusConnection * connection,
 
 
 G_END_DECLS
-#endif /* __MPRIS_H__ */
+#endif /* __DLNA_H__ */
diff --git a/src/gst_engine.c b/src/gst_engine.c
index f31a4ae..621dd08 100644
--- a/src/gst_engine.c
+++ b/src/gst_engine.c
@@ -402,8 +402,6 @@ engine_load_uri (GstEngine * engine, gchar * uri)
 gboolean
 engine_open_uri (GstEngine * engine, gchar * uri)
 {
-  g_print ("opennning uriii! %s \n", uri);
-
   g_object_set (G_OBJECT (engine->player), "uri", uri, NULL);
   gst_element_set_state (engine->player, GST_STATE_READY);
 
@@ -413,8 +411,6 @@ engine_open_uri (GstEngine * engine, gchar * uri)
 gboolean
 engine_play (GstEngine * engine)
 {
-  g_print ("Plaaayingg\n");
-
   gst_element_set_state (engine->player, GST_STATE_PLAYING);
 
   return TRUE;
@@ -423,8 +419,6 @@ engine_play (GstEngine * engine)
 gboolean
 engine_stop (GstEngine * engine)
 {
-  g_print ("Stopping\n");
-
   gst_element_set_state (engine->player, GST_STATE_READY);
 
   return TRUE;
diff --git a/src/snappy.c b/src/snappy.c
index c110f7b..0f28248 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -29,7 +29,7 @@
 #include <clutter-gst/clutter-gst.h>
 
 #include "user_interface.h"
-#include "mpris.h"
+#include "dlna.h"
 #include "gst_engine.h"
 #include "utils.h"
 
@@ -139,6 +139,7 @@ main (int argc, char *argv[])
 {
   UserInterface *ui = NULL;
   GstEngine *engine = NULL;
+  SnappyMP *mp_obj = NULL;
   ClutterActor *video_texture;
   GstElement *sink;
 
@@ -196,7 +197,7 @@ main (int argc, char *argv[])
 
   mp_obj = g_new (SnappyMP, 1);
   mp_obj->engine = engine;
-  load_mpris (mp_obj);
+  load_dlna (mp_obj);
   //  g_signal_connect (mp_obj, "open-uri",
   //    G_CALLBACK (open_uri_callback), engine);