From 635c29055635a82fb7b36380fdbcf92935af90ef Mon Sep 17 00:00:00 2001 From: pontscho Date: Tue, 4 Jun 2002 16:38:18 +0000 Subject: add network streaming support for gui git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6299 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/events.c | 3 +- Gui/events.h | 2 + Gui/gui.mak | 2 +- Gui/mplayer/gtk/menu.c | 2 +- Gui/mplayer/gtk/url.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++++ Gui/mplayer/gtk/url.h | 11 +++ Gui/mplayer/mw.h | 11 +++ Gui/mplayer/widgets.c | 4 + 8 files changed, 261 insertions(+), 3 deletions(-) create mode 100644 Gui/mplayer/gtk/url.c create mode 100644 Gui/mplayer/gtk/url.h diff --git a/Gui/events.c b/Gui/events.c index 8c93a1322a..73212b21be 100644 --- a/Gui/events.c +++ b/Gui/events.c @@ -44,7 +44,8 @@ evName evNames[] = { evHelp, "evHelp" }, { evLoadSubtitle, "evLoadSubtitle" }, { evPlayDVD, "evPlayDVD" }, - { evPlayVCD, "evPlayVCD" } + { evPlayVCD, "evPlayVCD" }, + { evSetURL, "evSetURL" } }; int evBoxs = sizeof( evNames ) / sizeof( evName ); diff --git a/Gui/events.h b/Gui/events.h index a5607932c4..5ba9df85a7 100644 --- a/Gui/events.h +++ b/Gui/events.h @@ -49,6 +49,7 @@ #define evLoadSubtitle 38 #define evPlayDVD 39 #define evPlayVCD 40 +#define evPlayNetwork 41 #define evExit 1000 @@ -67,6 +68,7 @@ #define evSetDVDChapter 5010 #define evSubtitleLoaded 5011 #define evSetVCDTrack 5012 +#define evSetURL 5013 #define evFName 7000 #define evMovieTime 7001 diff --git a/Gui/gui.mak b/Gui/gui.mak index cd12beebdd..9c1e7534fb 100644 --- a/Gui/gui.mak +++ b/Gui/gui.mak @@ -4,7 +4,7 @@ SKINOBJ = skin/skin.o skin/font.o skin/cut.o GTKSRCS = $(MPLAYERDIR)gtk/menu.c $(MPLAYERDIR)gtk/mb.c $(MPLAYERDIR)gtk/about.c \ $(MPLAYERDIR)gtk/pl.c $(MPLAYERDIR)gtk/sb.c $(MPLAYERDIR)gtk/fs.c \ - $(MPLAYERDIR)gtk/opts.c + $(MPLAYERDIR)gtk/opts.c $(MPLAYERDIR)gtk/url.c MPLAYERSRCS = $(MPLAYERDIR)mplayer.c $(MPLAYERDIR)widgets.c $(MPLAYERDIR)play.c \ $(GTKSRCS) diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 641fc61746..78bf212eac 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -275,7 +275,7 @@ GtkWidget * create_PopUpMenu( void ) #ifdef USE_DVDREAD AddMenuItem( SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD ); #endif - AddMenuItem( SubMenu,MSGTR_MENU_PlayURL, evNone ); + AddMenuItem( SubMenu,MSGTR_MENU_PlayURL, evSetURL ); AddMenuItem( SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle ); SubMenu=AddSubMenu( Menu,MSGTR_MENU_Playing ); AddMenuItem( SubMenu,MSGTR_MENU_Play" ", evPlay ); diff --git a/Gui/mplayer/gtk/url.c b/Gui/mplayer/gtk/url.c new file mode 100644 index 0000000000..439fc7d702 --- /dev/null +++ b/Gui/mplayer/gtk/url.c @@ -0,0 +1,229 @@ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "url.h" +#include "../../interface.h" +#include "../../events.h" + +GtkWidget * URL; +int gtkVURLDialogBox = 0; + +static GtkWidget * URLCombo; +static GtkWidget * URLEntry; +static GList * URLComboEntrys = NULL; + +void ShowURLDialogBox( void ) +{ + if ( gtkVURLDialogBox ) gtkActive( URL ); + else URL=create_URL(); + + if ( URLComboEntrys ) + { + gtk_entry_set_text( GTK_ENTRY( URLEntry ),URLComboEntrys->data ); + gtk_combo_set_popdown_strings( GTK_COMBO( URLCombo ),URLComboEntrys ); + } + + gtk_widget_show( URL ); + gtkVURLDialogBox=1; +} + +void HideURLDialogBox( void ) +{ + gtk_widget_hide( URL ); + gtk_widget_destroy( URL ); + gtkVURLDialogBox=0; +} + +static gboolean on_URL_destroy_event( GtkWidget * widget,GdkEvent * event,gpointer user_data ) +{ + HideURLDialogBox(); + return FALSE; +} + +static void on_Button_pressed( GtkButton * button,gpointer user_data ) +{ + if ( (int)user_data ) + { + gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) ); + + if ( str ) + { + if ( strncmp( str,"http://",7 ) && strncmp( str,"ftp://",6 ) && !strncmp( str,"mms://",6 ) ) + { + gchar * tmp; + tmp=malloc( strlen( str ) + 8 ); + sprintf( tmp,"http://%s",str ); + free( str ); str=tmp; + } + URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str ); + + guiSetFilename( guiIntfStruct.Filename,str ); guiIntfStruct.FilenameChanged=1; + mplEventHandling( evPlay,0 ); + } + } + HideURLDialogBox(); +} + +static void ab_URL_show( GtkButton * button,gpointer user_data ) +{ gtkVURLDialogBox=(int)user_data; } + +GtkWidget * create_URL( void ) +{ + GtkWidget * frame1; + GtkWidget * frame2; + GtkWidget * frame3; + GtkWidget * frame4; + GtkWidget * vbox1; + GtkWidget * hbox1; + GtkWidget * label1; + GtkWidget * frame5; + GtkWidget * hbuttonbox1; + GtkWidget * Ok; + GtkWidget * Cancel; + GtkAccelGroup * accel_group; + + accel_group=gtk_accel_group_new(); + + URL=gtk_window_new( GTK_WINDOW_DIALOG ); + gtk_widget_set_name( URL,"URL" ); + gtk_object_set_data( GTK_OBJECT( URL ),"URL",URL ); + gtk_widget_set_usize( URL,384,80 ); + GTK_WIDGET_SET_FLAGS( URL,GTK_CAN_FOCUS ); + GTK_WIDGET_SET_FLAGS( URL,GTK_CAN_DEFAULT ); + gtk_window_set_title( GTK_WINDOW( URL ),"Network streaming ..." ); + gtk_window_set_position( GTK_WINDOW( URL ),GTK_WIN_POS_CENTER ); + gtk_window_set_default_size( GTK_WINDOW( URL ),-1,80 ); + gtk_window_set_policy( GTK_WINDOW( URL ),TRUE,TRUE,FALSE ); + + frame1=gtk_frame_new( NULL ); + gtk_widget_set_name( frame1,"frame1" ); + gtk_widget_ref( frame1 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"frame1",frame1,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( frame1 ); + gtk_container_add( GTK_CONTAINER( URL ),frame1 ); + gtk_container_set_border_width( GTK_CONTAINER( frame1 ),1 ); + gtk_frame_set_shadow_type( GTK_FRAME( frame1 ),GTK_SHADOW_IN ); + + frame2=gtk_frame_new( NULL ); + gtk_widget_set_name( frame2,"frame2" ); + gtk_widget_ref( frame2 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"frame2",frame2,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( frame2 ); + gtk_container_add( GTK_CONTAINER( frame1 ),frame2 ); + gtk_container_set_border_width( GTK_CONTAINER( frame2 ),1 ); + gtk_frame_set_shadow_type( GTK_FRAME( frame2 ),GTK_SHADOW_NONE ); + + frame3=gtk_frame_new( NULL ); + gtk_widget_set_name( frame3,"frame3" ); + gtk_widget_ref( frame3 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"frame3",frame3,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( frame3 ); + gtk_container_add( GTK_CONTAINER( frame2 ),frame3 ); + gtk_frame_set_shadow_type( GTK_FRAME( frame3 ),GTK_SHADOW_ETCHED_OUT ); + + frame4=gtk_frame_new( NULL ); + gtk_widget_set_name( frame4,"frame4" ); + gtk_widget_ref( frame4 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"frame4",frame4,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( frame4 ); + gtk_container_add( GTK_CONTAINER( frame3 ),frame4 ); + gtk_frame_set_shadow_type( GTK_FRAME( frame4 ),GTK_SHADOW_NONE ); + + vbox1=gtk_vbox_new( FALSE,0 ); + gtk_widget_set_name( vbox1,"vbox1" ); + gtk_widget_ref( vbox1 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"vbox1",vbox1,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( vbox1 ); + gtk_container_add( GTK_CONTAINER( frame4 ),vbox1 ); + + hbox1=gtk_hbox_new( FALSE,0 ); + gtk_widget_set_name( hbox1,"hbox1" ); + gtk_widget_ref( hbox1 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"hbox1",hbox1,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( hbox1 ); + gtk_box_pack_start( GTK_BOX( vbox1 ),hbox1,TRUE,TRUE,0 ); + + label1=gtk_label_new( "URL: " ); + gtk_widget_set_name( label1,"label1" ); + gtk_widget_ref( label1 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"label1",label1,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( label1 ); + gtk_box_pack_start( GTK_BOX( hbox1 ),label1,FALSE,FALSE,0 ); + gtk_widget_set_usize( label1,38,-2 ); + gtk_label_set_justify( GTK_LABEL( label1 ),GTK_JUSTIFY_FILL ); + gtk_misc_set_alignment( GTK_MISC( label1 ),0.5,0.49 ); + + URLCombo=gtk_combo_new(); + gtk_widget_set_name( URLCombo,"URLCombo" ); + gtk_widget_ref( URLCombo ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"URLCombo",URLCombo,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( URLCombo ); + gtk_box_pack_start( GTK_BOX( hbox1 ),URLCombo,TRUE,TRUE,0 ); + + URLEntry=GTK_COMBO( URLCombo )->entry; + gtk_widget_set_name( URLEntry,"URLEntry" ); + gtk_widget_ref( URLEntry ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"URLEntry",URLEntry,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( URLEntry ); + + frame5=gtk_frame_new( NULL ); + gtk_widget_set_name( frame5,"frame5" ); + gtk_widget_ref( frame5 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"frame5",frame5,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( frame5 ); + gtk_box_pack_start( GTK_BOX( hbox1 ),frame5,FALSE,TRUE,0 ); + gtk_frame_set_shadow_type( GTK_FRAME( frame5 ),GTK_SHADOW_NONE ); + + hbuttonbox1=gtk_hbutton_box_new(); + gtk_widget_set_name( hbuttonbox1,"hbuttonbox1" ); + gtk_widget_ref( hbuttonbox1 ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"hbuttonbox1",hbuttonbox1,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( hbuttonbox1 ); + gtk_box_pack_start( GTK_BOX( vbox1 ),hbuttonbox1,FALSE,FALSE,0 ); + gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); + gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),0 ); + + Ok=gtk_button_new_with_label( "Ok" ); + gtk_widget_set_name( Ok,"Ok" ); + gtk_widget_ref( Ok ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"Ok",Ok,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( Ok ); + gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),Ok ); + GTK_WIDGET_SET_FLAGS( Ok,GTK_CAN_DEFAULT ); + + Cancel=gtk_button_new_with_label( "Cancel" ); + gtk_widget_set_name( Cancel,"Cancel" ); + gtk_widget_ref( Cancel ); + gtk_object_set_data_full( GTK_OBJECT( URL ),"Cancel",Cancel,(GtkDestroyNotify)gtk_widget_unref ); + gtk_widget_show( Cancel ); + gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),Cancel ); + GTK_WIDGET_SET_FLAGS( Cancel,GTK_CAN_DEFAULT ); + + gtk_widget_add_accelerator( Ok,"pressed",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); +// gtk_widget_add_accelerator( Ok,"pressed",accel_group,GDK_O,GDK_MOD1_MASK,GTK_ACCEL_VISIBLE ); +// gtk_widget_add_accelerator( Ok,"pressed",accel_group,GDK_o,GDK_MOD1_MASK,GTK_ACCEL_VISIBLE ); + gtk_widget_add_accelerator( Cancel,"pressed",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); +// gtk_widget_add_accelerator( Cancel,"pressed",accel_group,GDK_C,GDK_MOD1_MASK,GTK_ACCEL_VISIBLE ); +// gtk_widget_add_accelerator( Cancel,"pressed",accel_group,GDK_c,GDK_MOD1_MASK,GTK_ACCEL_VISIBLE ); + + gtk_signal_connect( GTK_OBJECT( URL ),"destroy",GTK_SIGNAL_FUNC( on_URL_destroy_event ),NULL ); + gtk_signal_connect( GTK_OBJECT( URL ),"show",GTK_SIGNAL_FUNC( ab_URL_show ),(void *)1 ); + gtk_signal_connect( GTK_OBJECT( URL ),"hide",GTK_SIGNAL_FUNC( ab_URL_show ),0 ); + + gtk_signal_connect( GTK_OBJECT( Ok ),"pressed",GTK_SIGNAL_FUNC( on_Button_pressed ),(void *)1 ); + gtk_signal_connect( GTK_OBJECT( Cancel ),"pressed",GTK_SIGNAL_FUNC( on_Button_pressed ),NULL ); + + gtk_widget_grab_default( Ok ); + gtk_window_add_accel_group( GTK_WINDOW( URL ),accel_group ); + + return URL; +} + diff --git a/Gui/mplayer/gtk/url.h b/Gui/mplayer/gtk/url.h new file mode 100644 index 0000000000..46d78b7eee --- /dev/null +++ b/Gui/mplayer/gtk/url.h @@ -0,0 +1,11 @@ + +#ifndef _URL_H +#define _URL_H + +extern GtkWidget * URL; +extern int gtkVURLDialogBox; + +extern void ShowURLDialogBox( void ); +extern GtkWidget * create_URL( void ); + +#endif \ No newline at end of file diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 9d5da0a09a..dfc094f1c9 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -20,6 +20,9 @@ inline void TranslateFilename( int c,char * tmp ) int i; switch ( guiIntfStruct.StreamType ) { + case STREAMTYPE_STREAM: + strcpy( tmp,guiIntfStruct.Filename ); + break; case STREAMTYPE_FILE: if ( ( guiIntfStruct.Filename )&&( guiIntfStruct.Filename[0] ) ) { @@ -221,6 +224,13 @@ void mplEventHandling( int msg,float param ) exit_player( "Exit" ); break; + case evPlayNetwork: + guiIntfStruct.StreamType=STREAMTYPE_STREAM; + goto play; + case evSetURL: + gtkShow( evPlayNetwork,NULL ); + break; + #ifdef HAVE_VCD case evSetVCDTrack: guiIntfStruct.Track=(int)param; @@ -247,6 +257,7 @@ play: switch ( guiIntfStruct.StreamType ) { + case STREAMTYPE_STREAM: case STREAMTYPE_FILE: guiGetEvent( guiClearStruct,guiALL ); break; diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index a4ef8aa422..6602096db0 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -45,6 +45,7 @@ int gtkInited = 0; #include "gtk/about.h" #include "gtk/opts.h" #include "gtk/menu.h" +#include "gtk/url.h" // --- init & close gtk @@ -187,6 +188,9 @@ void gtkShow( int type,char * param ) case evHidePopUpMenu: if ( PopUpMenu ) gtk_widget_hide_on_delete( PopUpMenu ); break; + case evPlayNetwork: + ShowURLDialogBox(); + break; } } -- cgit v1.2.3