Interface for Familiar Linux does not segfault anymore. Still to fix playing of files.

diff --git a/plugins/familiar/familiar.glade b/plugins/familiar/familiar.glade
index d7056c49795282daba3a470e6b9189362416982e..a7167749e7a3518b74ce670b58205e6fd3231958 100644 (file)
--- a/plugins/familiar/familiar.glade
+++ b/plugins/familiar/familiar.glade
@@ -300,6 +300,21 @@ udpstream://@:1234
              <handler>on_clistmedia_click_column</handler>
              <last_modification_time>Sun, 18 Aug 2002 19:41:06 GMT</last_modification_time>
            </signal>
+           <signal>
+             <name>start_selection</name>
+             <handler>on_clistmedia_start_selection</handler>
+             <last_modification_time>Tue, 01 Oct 2002 19:25:54 GMT</last_modification_time>
+           </signal>
+           <signal>
+             <name>end_selection</name>
+             <handler>on_clistmedia_end_selection</handler>
+             <last_modification_time>Tue, 01 Oct 2002 19:26:13 GMT</last_modification_time>
+           </signal>
+           <signal>
+             <name>enter_notify_event</name>
+             <handler>on_clistmedia_enter_notify_event</handler>
+             <last_modification_time>Tue, 01 Oct 2002 19:26:50 GMT</last_modification_time>
+           </signal>
            <columns>5</columns>
            <column_widths>123,80,80,80,80</column_widths>
            <selection_mode>GTK_SELECTION_SINGLE</selection_mode>

diff --git a/plugins/familiar/familiar_callbacks.c b/plugins/familiar/familiar_callbacks.c
index 22755e0061714bbae69ca77c75428882e9db6709..ab77666bebf0d86d9c3e3fa7a101b7fdd0319fa1 100644 (file)
--- a/plugins/familiar/familiar_callbacks.c
+++ b/plugins/familiar/familiar_callbacks.c
@@ -2,7 +2,7 @@
  * callbacks.c : Callbacks for the Familiar Linux Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: familiar_callbacks.c,v 1.6.2.2 2002/09/30 22:01:43 jpsaman Exp $
+ * $Id: familiar_callbacks.c,v 1.6.2.3 2002/10/01 19:46:47 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -55,7 +55,7 @@
 #include "familiar_support.h"
 #include "familiar.h"
 
-/*#include "netutils.h"*/
+#include "netutils.h"
 
 static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url );
 static char* get_file_perm(const char *path);
@@ -101,8 +101,8 @@ static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url )
 {
     intf_thread_t *p_intf = GtkGetIntf( widget );
 
-    g_print( "%s\n",psz_url );
     intf_ErrMsg( "@@@ MediaURLOpenChanged" );
+    g_print( "%s\n",psz_url );
     if( p_intf->p_sys->p_input != NULL )
     {
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
@@ -111,7 +111,6 @@ static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url )
     else
     {
         vlc_mutex_lock( &p_main->p_playlist->change_lock );
-
         if( p_main->p_playlist->b_stopped )
         {
             if( p_main->p_playlist->i_size )
@@ -133,13 +132,12 @@ static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url )
  ****************************************************************/
 void ReadDirectory( GtkCList *clist, char *psz_dir )
 {
-//    intf_thread_t *p_intf = GtkGetIntf( clist );
+    intf_thread_t *p_intf = GtkGetIntf( clist );
     struct dirent **namelist;
     int n=-1;
     int status=-1;
 
     intf_ErrMsg( "@@@ ReadDirectory - Enter" );
-    g_print( "%s\n",psz_dir );
     if (psz_dir)
     {
        status = chdir(psz_dir);
@@ -156,23 +154,21 @@ void ReadDirectory( GtkCList *clist, char *psz_dir )
         gchar *ppsz_text[2];
         int i;
 
-        gtk_clist_freeze( clist );
-        gtk_clist_clear( clist );
+        gtk_clist_freeze( p_intf->p_sys->p_clist );
+        gtk_clist_clear( p_intf->p_sys->p_clist );
         g_print( "dir entries: %d\n",n );
         for (i=0; i<n; i++)
         {
             /* This is a list of strings. */
             ppsz_text[0] = namelist[i]->d_name;
             ppsz_text[1] = get_file_perm(namelist[i]->d_name);
-            g_print( "%s %s\n",ppsz_text[0],ppsz_text[1] );
             if (strcmp(ppsz_text[1],"") == 0)
                 intf_ErrMsg("File system error unknown filetype encountered.");
-            gtk_clist_insert( clist, i, ppsz_text );
-            g_print( "%s\n",ppsz_text[0] );
+            gtk_clist_insert( p_intf->p_sys->p_clist, i, ppsz_text );
             free(namelist[i]);
         }
+        gtk_clist_thaw( p_intf->p_sys->p_clist );
         free(namelist);
-        gtk_clist_thaw( clist );
     }
     intf_ErrMsg( "@@@ ReadDirectory - Exit" );
 }
@@ -467,25 +463,23 @@ on_clistmedia_select_row               (GtkCList        *clist,
                                         GdkEvent        *event,
                                         gpointer         user_data)
 {
+    intf_thread_t *p_intf = GtkGetIntf( clist );
     gchar *text[2];
     gint ret;
     struct stat st;
 
-    if (clist == NULL)
-       intf_ErrMsg("clist is unusable.");
+//    gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) );
+//    gdk_window_raise( p_intf->p_sys->p_window->window );
 
-    ret = gtk_clist_get_text (clist, row, 0, text);
+    ret = gtk_clist_get_text (p_intf->p_sys->p_clist, row, 0, text);
     if (ret)
     {
         if (lstat((char*)text[0], &st)==0)
         {
             if (S_ISDIR(st.st_mode))
-            {
-               g_print( "read dir %s\n", text[0] );
-               ReadDirectory(clist, text[0]);
-            }
+               ReadDirectory(p_intf->p_sys->p_clist, text[0]);
             else
-               MediaURLOpenChanged(GTK_WIDGET(clist), text[0]);
+               MediaURLOpenChanged(GTK_WIDGET(p_intf->p_sys->p_clist), text[0]);
        }
     }
 }
@@ -510,7 +504,32 @@ on_familiar_delete_event               (GtkWidget       *widget,
                                         gpointer         user_data)
 {
     GtkExit( GTK_WIDGET( widget ), user_data );
-    exit (0); //dirty
     return TRUE;
 }
 
+
+void
+on_clistmedia_start_selection          (GtkCList        *clist,
+                                        gpointer         user_data)
+{
+    g_print( ">>>>start_selection\n" );
+}
+
+
+void
+on_clistmedia_end_selection            (GtkCList        *clist,
+                                        gpointer         user_data)
+{
+    g_print( ">>>>end_selection\n" );
+}
+
+
+gboolean
+on_clistmedia_enter_notify_event       (GtkWidget       *widget,
+                                        GdkEventCrossing *event,
+                                        gpointer         user_data)
+{
+  g_print( ">>>>enter_notify_event\n" );
+  return FALSE;
+}
+

diff --git a/plugins/familiar/familiar_callbacks.h b/plugins/familiar/familiar_callbacks.h
index dc9067cf953f21e2ae6d9c180040092e09c0497f..e8c5d94cc2deb47cb5fcbc99d193601ba7a2cb86 100644 (file)
--- a/plugins/familiar/familiar_callbacks.h
+++ b/plugins/familiar/familiar_callbacks.h
@@ -2,7 +2,7 @@
  * callbacks.h : familiar plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: familiar_callbacks.h,v 1.7.2.2 2002/09/30 22:01:43 jpsaman Exp $
+ * $Id: familiar_callbacks.h,v 1.7.2.3 2002/10/01 19:46:47 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -87,3 +87,16 @@ on_familiar_delete_event               (GtkWidget       *widget,
                                         gpointer         user_data);
 
 
+
+void
+on_clistmedia_start_selection          (GtkCList        *clist,
+                                        gpointer         user_data);
+
+void
+on_clistmedia_end_selection            (GtkCList        *clist,
+                                        gpointer         user_data);
+
+gboolean
+on_clistmedia_enter_notify_event       (GtkWidget       *widget,
+                                        GdkEventCrossing *event,
+                                        gpointer         user_data);

diff --git a/plugins/familiar/familiar_interface.c b/plugins/familiar/familiar_interface.c
index 6bb59ec440daa099aa95be00d0727a05ccffd473..7192ea52d1f7fe5ba2067680f55893e030024fcc 100644 (file)
--- a/plugins/familiar/familiar_interface.c
+++ b/plugins/familiar/familiar_interface.c
@@ -489,6 +489,15 @@ create_familiar (void)
   gtk_signal_connect (GTK_OBJECT (clistmedia), "click_column",
                       GTK_SIGNAL_FUNC (on_clistmedia_click_column),
                       NULL);
+  gtk_signal_connect (GTK_OBJECT (clistmedia), "start_selection",
+                      GTK_SIGNAL_FUNC (on_clistmedia_start_selection),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (clistmedia), "end_selection",
+                      GTK_SIGNAL_FUNC (on_clistmedia_end_selection),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (clistmedia), "enter_notify_event",
+                      GTK_SIGNAL_FUNC (on_clistmedia_enter_notify_event),
+                      NULL);
   gtk_signal_connect (GTK_OBJECT (cbautoplay), "toggled",
                       GTK_SIGNAL_FUNC (on_cbautoplay_toggled),
                       NULL);