mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-11 14:21:20 +00:00
The bonobo component now works on audio only (mp3/vorbis). Video is broken because bonobo does not handle multithread...
Original commit message from CVS: The bonobo component now works on audio only (mp3/vorbis). Video is broken because bonobo does not handle multithreading yet. Added Bonobo toolbar and menu.
This commit is contained in:
Wim Taymans
parent
ef31aa64e8
commit
01eb2caf72
3 changed files with 277 additions and 305 deletions
|
|
@ -5,14 +5,14 @@ INCLUDES = -I$(top_srcdir)/gst \
|
|||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||
-DDATADIR=\""$(datadir)"\" \
|
||||
-I$(includedir) \
|
||||
$(BONOBOX_TEST_CFLAGS)
|
||||
$(BONOBOX_TEST_CFLAGS) -Wall -O2
|
||||
|
||||
bin_PROGRAMS = bonobo-gstmediaplay
|
||||
|
||||
bonobo_gstmediaplay_SOURCES = \
|
||||
bonobo-gstmediaplay.c
|
||||
|
||||
bonobo_gstmediaplay_CFLAGS = \
|
||||
bonobo_gstmediaplay_CFLAGS = -Wall -O2 \
|
||||
$(shell gnome-config --cflags gnomeui bonobo bonobox) $(shell libglade-config --cflags gnome) \
|
||||
$(shell gstreamer-config --clfags )
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,10 @@
|
|||
|
||||
#include "gstplay.h"
|
||||
|
||||
#include "pause.xpm"
|
||||
#include "play.xpm"
|
||||
#include "stop.xpm"
|
||||
|
||||
/*
|
||||
* Number of running objects
|
||||
*/
|
||||
|
|
@ -55,101 +59,82 @@ control_system_exception_cb (BonoboControl *control, CORBA_Object corba_object,
|
|||
static void
|
||||
control_update (control_data_t *control_data)
|
||||
{
|
||||
g_print("control_update\n", running_objects);
|
||||
gtk_widget_queue_draw (GTK_WIDGET (control_data->play));
|
||||
g_print("control_update done\n", running_objects);
|
||||
}
|
||||
|
||||
static void
|
||||
load_media (BonoboPersistStream *ps,
|
||||
const Bonobo_Stream stream,
|
||||
Bonobo_Persist_ContentType type,
|
||||
void *closure,
|
||||
CORBA_Environment *ev)
|
||||
verb_Play_cb (BonoboUIComponent *uic, gpointer user_data, const char *cname)
|
||||
{
|
||||
control_data_t *control_data = closure;
|
||||
GstPlay *pl;
|
||||
Bonobo_Stream_iobuf *buffer;
|
||||
char *str;
|
||||
int bx, by, j;
|
||||
|
||||
g_return_if_fail (control_data != NULL);
|
||||
g_return_if_fail (control_data->play != NULL);
|
||||
|
||||
if (*type && g_strcasecmp (type, "application/x-gstmediaplay") != 0) {
|
||||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||||
ex_Bonobo_Persist_WrongDataType, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
pl = control_data->play;
|
||||
|
||||
bonobo_stream_client_read_string (stream, &str, ev);
|
||||
if (ev->_major != CORBA_NO_EXCEPTION || str == NULL) {
|
||||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||||
ex_Bonobo_Persist_WrongDataType, NULL);
|
||||
return;
|
||||
}
|
||||
sscanf (str, "%2u%2u\n", &bx, &by);
|
||||
g_free (str);
|
||||
|
||||
if (bx > 128 || by > 128) {
|
||||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||||
ex_Bonobo_Persist_WrongDataType, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
for (j = 0; j < by; j++) {
|
||||
int i;
|
||||
|
||||
Bonobo_Stream_read (stream, bx * 2 + 1, &buffer, ev);
|
||||
if (ev->_major != CORBA_NO_EXCEPTION)
|
||||
return;
|
||||
else if (buffer->_length != bx * 2 + 1) {
|
||||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||||
ex_Bonobo_Persist_WrongDataType,
|
||||
NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
CORBA_free (buffer);
|
||||
}
|
||||
control_data_t *control_data = (control_data_t *) user_data;
|
||||
|
||||
gst_play_play (control_data->play);
|
||||
control_update (control_data);
|
||||
}
|
||||
|
||||
static void
|
||||
save_media (BonoboPersistStream *ps,
|
||||
const Bonobo_Stream stream,
|
||||
Bonobo_Persist_ContentType type,
|
||||
void *closure,
|
||||
CORBA_Environment *ev)
|
||||
verb_Pause_cb (BonoboUIComponent *uic, gpointer user_data, const char *cname)
|
||||
{
|
||||
control_data_t *control_data = closure;
|
||||
GstPlay *pl;
|
||||
char *data;
|
||||
int j;
|
||||
control_data_t *control_data = (control_data_t *) user_data;
|
||||
|
||||
g_return_if_fail (control_data != NULL);
|
||||
g_return_if_fail (control_data->play != NULL);
|
||||
|
||||
if (*type && g_strcasecmp (type, "application/x-gstmediaplay") != 0) {
|
||||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||||
ex_Bonobo_Persist_WrongDataType, NULL);
|
||||
return;
|
||||
gst_play_pause (control_data->play);
|
||||
control_update (control_data);
|
||||
}
|
||||
|
||||
pl = control_data->play;
|
||||
static void
|
||||
verb_Stop_cb (BonoboUIComponent *uic, gpointer user_data, const char *cname)
|
||||
{
|
||||
control_data_t *control_data = (control_data_t *) user_data;
|
||||
|
||||
if (ev->_major != CORBA_NO_EXCEPTION)
|
||||
return;
|
||||
gst_play_stop (control_data->play);
|
||||
control_update (control_data);
|
||||
}
|
||||
|
||||
static Bonobo_Persist_ContentTypeList *
|
||||
content_types (BonoboPersistStream *ps, void *closure, CORBA_Environment *ev)
|
||||
typedef struct {
|
||||
control_data_t *control_data;
|
||||
GtkFileSelection *selector;
|
||||
} file_select_struct;
|
||||
|
||||
static void
|
||||
filename_selected (GtkButton *ok, gpointer user_data)
|
||||
{
|
||||
return bonobo_persist_generate_content_types (1, "application/x-gstmediaplay");
|
||||
file_select_struct *select = (file_select_struct *) user_data;
|
||||
|
||||
gchar *selected_filename;
|
||||
|
||||
selected_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION(select->selector));
|
||||
|
||||
gst_play_set_uri (select->control_data->play, selected_filename);
|
||||
|
||||
gst_play_play (select->control_data->play);
|
||||
control_update (select->control_data);
|
||||
|
||||
g_free(select);
|
||||
}
|
||||
|
||||
static void
|
||||
verb_Open_cb (BonoboUIComponent *uic, gpointer user_data, const char *cname)
|
||||
{
|
||||
control_data_t *control_data = (control_data_t *) user_data;
|
||||
file_select_struct *data = g_new0(file_select_struct, 1);
|
||||
GtkWidget *file_selector;
|
||||
|
||||
file_selector = gtk_file_selection_new("Select a media file");
|
||||
|
||||
data->selector = GTK_FILE_SELECTION (file_selector);
|
||||
data->control_data = control_data;
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(file_selector)->ok_button),
|
||||
"clicked", GTK_SIGNAL_FUNC (filename_selected), data);
|
||||
|
||||
gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(file_selector)->ok_button),
|
||||
"clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
|
||||
(gpointer) file_selector);
|
||||
|
||||
gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(file_selector)->cancel_button),
|
||||
"clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
|
||||
(gpointer) file_selector);
|
||||
|
||||
gtk_widget_show (file_selector);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -166,20 +151,28 @@ control_create_menus (control_data_t *control_data)
|
|||
static char ui [] =
|
||||
"<Root>"
|
||||
" <commands>"
|
||||
" <cmd name=\"NewGame\" _label=\"New game\" _tip=\"Start a new game\"/>"
|
||||
" <cmd name=\"OpenGame\" _label=\"Open game\" _tip=\"Load a saved game\"/>"
|
||||
" <cmd name=\"Play\" _label=\"Play\" _tip=\"Play\"/>"
|
||||
" <cmd name=\"Pause\" _label=\"Pause\" _tip=\"Pause\"/>"
|
||||
" <cmd name=\"Stop\" _label=\"Stop\" _tip=\"Stop\"/>"
|
||||
" <cmd name=\"Open\" _label=\"Open Media\" _tip=\"Open a media stream\"/>"
|
||||
" </commands>"
|
||||
" <menu>"
|
||||
" <submenu name=\"Game\" _label=\"_Game\">"
|
||||
" <menuitem name=\"NewGame\" verb=\"\"/>"
|
||||
" <menuitem name=\"OpenGame\" verb=\"\"/>"
|
||||
" <submenu name=\"Player\" _label=\"_Player\">"
|
||||
" <menuitem name=\"Open\" pixtype=\"stock\" pixname=\"Open\" verb=\"\"/>"
|
||||
" <separator/>"
|
||||
" <menuitem name=\"Play\" verb=\"\"/>"
|
||||
" <menuitem name=\"Pause\" verb=\"\"/>"
|
||||
" <menuitem name=\"Stop\" verb=\"\"/>"
|
||||
" </submenu>"
|
||||
" </menu>"
|
||||
" <dockitem name=\"Game\">"
|
||||
" <toolitem name=\"NewGame\" verb=\"\"/>"
|
||||
" <dockitem name=\"GstMediaPlay\">"
|
||||
" <toolitem name=\"Play\" type=\"toggle\" verb=\"\"/>"
|
||||
" <toolitem name=\"Pause\" type=\"toggle\" verb=\"\"/>"
|
||||
" <toolitem name=\"Stop\" type=\"toggle\" verb=\"\"/>"
|
||||
" </dockitem>"
|
||||
"</Root>";
|
||||
|
||||
g_print("create menu\n");
|
||||
/*
|
||||
* Get our container's UIContainer server.
|
||||
*/
|
||||
|
|
@ -194,6 +187,7 @@ control_create_menus (control_data_t *control_data)
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Give our BonoboUIComponent object a reference to the
|
||||
* container's UIContainer server.
|
||||
|
|
@ -218,6 +212,19 @@ control_create_menus (control_data_t *control_data)
|
|||
|
||||
bonobo_ui_node_free (node);
|
||||
}
|
||||
|
||||
pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) play_back_xpm);
|
||||
bonobo_ui_util_set_pixbuf (control_data->uic, "/commands/Play", pixbuf);
|
||||
gdk_pixbuf_unref (pixbuf);
|
||||
|
||||
pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) pause_xpm);
|
||||
bonobo_ui_util_set_pixbuf (control_data->uic, "/commands/Pause", pixbuf);
|
||||
gdk_pixbuf_unref (pixbuf);
|
||||
|
||||
pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) stop_back_xpm);
|
||||
bonobo_ui_util_set_pixbuf (control_data->uic, "/commands/Stop", pixbuf);
|
||||
gdk_pixbuf_unref (pixbuf);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -234,8 +241,6 @@ control_destroy_cb (BonoboControl *control, gpointer data)
|
|||
{
|
||||
control_data_t *control_data = (control_data_t *) data;
|
||||
|
||||
g_message ("control_destroy_cb");
|
||||
|
||||
control_data->play = NULL;
|
||||
|
||||
g_free (control_data);
|
||||
|
|
@ -280,16 +285,7 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
|
|||
static void
|
||||
control_set_frame_cb (BonoboControl *control, gpointer data)
|
||||
{
|
||||
g_message ("control_set frame cb");
|
||||
control_create_menus ((control_data_t *) data);
|
||||
g_message ("control_set frame cb done");
|
||||
}
|
||||
|
||||
static void
|
||||
update_control (GtkWidget *widget, control_data_t *control_data)
|
||||
{
|
||||
g_message ("update_control");
|
||||
control_update (control_data);
|
||||
}
|
||||
|
||||
static BonoboObject *
|
||||
|
|
@ -297,9 +293,9 @@ bonobo_gstmediaplay_factory (BonoboGenericFactory *this, void *data)
|
|||
{
|
||||
BonoboControl *bonobo_object;
|
||||
control_data_t *control_data;
|
||||
BonoboPersistStream *stream;
|
||||
GtkWidget *vbox;
|
||||
|
||||
gst_init (NULL, NULL);
|
||||
/*
|
||||
* Create a data structure in which we can store
|
||||
* Control-object-specific data about this document.
|
||||
|
|
@ -308,9 +304,7 @@ bonobo_gstmediaplay_factory (BonoboGenericFactory *this, void *data)
|
|||
if (control_data == NULL)
|
||||
return NULL;
|
||||
|
||||
g_print("creating\n");
|
||||
control_data->play = gst_play_new ();
|
||||
g_print("created\n");
|
||||
|
||||
vbox = gtk_vbox_new (TRUE, 0);
|
||||
|
||||
|
|
@ -356,35 +350,15 @@ bonobo_gstmediaplay_factory (BonoboGenericFactory *this, void *data)
|
|||
gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy",
|
||||
GTK_SIGNAL_FUNC (control_destroy_cb), control_data);
|
||||
|
||||
/*
|
||||
* Create the PersistStream object.
|
||||
*/
|
||||
stream = bonobo_persist_stream_new (load_media, save_media,
|
||||
NULL, content_types,
|
||||
control_data);
|
||||
bonobo_ui_component_add_verb (control_data->uic, "Play",
|
||||
verb_Play_cb, control_data);
|
||||
bonobo_ui_component_add_verb (control_data->uic, "Pause",
|
||||
verb_Pause_cb, control_data);
|
||||
bonobo_ui_component_add_verb (control_data->uic, "Stop",
|
||||
verb_Stop_cb, control_data);
|
||||
|
||||
if (stream == NULL) {
|
||||
bonobo_object_unref (BONOBO_OBJECT (bonobo_object));
|
||||
gtk_widget_destroy (vbox);
|
||||
g_free (control_data);
|
||||
return NULL;
|
||||
}
|
||||
bonobo_object_add_interface (BONOBO_OBJECT (bonobo_object),
|
||||
BONOBO_OBJECT (stream));
|
||||
|
||||
/*
|
||||
* Add some verbs to the control.
|
||||
*
|
||||
* The container application will then have the programmatic
|
||||
* ability to execute the verbs on the component. It will
|
||||
* also provide a simple mechanism whereby the user can
|
||||
* right-click on the component to create a popup menu
|
||||
* listing the available verbs.
|
||||
*
|
||||
* We provide one simple verb whose job it is to clear the
|
||||
* window.
|
||||
*/
|
||||
control_data->uic = bonobo_control_get_ui_component (bonobo_object);
|
||||
bonobo_ui_component_add_verb (control_data->uic, "Open",
|
||||
verb_Open_cb, control_data);
|
||||
|
||||
/*
|
||||
* Count the new running object
|
||||
|
|
@ -398,7 +372,6 @@ bonobo_gstmediaplay_factory (BonoboGenericFactory *this, void *data)
|
|||
static void
|
||||
init_gstmediaplay_factory (void)
|
||||
{
|
||||
printf("init factory\n");
|
||||
factory = bonobo_generic_factory_new (
|
||||
"OAFIID:bonobo_gstmediaplay_factory:420f20ca-55d7-4a33-b327-0b246136db18",
|
||||
bonobo_gstmediaplay_factory, NULL);
|
||||
|
|
@ -415,21 +388,20 @@ init_server_factory (int argc, char **argv)
|
|||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
gnome_init_with_popt_table("gstmediaplay", VERSION,
|
||||
gnome_init_with_popt_table("bonobo-gstmediaplay", VERSION,
|
||||
argc, argv,
|
||||
oaf_popt_options, 0, NULL);
|
||||
orb = oaf_init (argc, argv);
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
if (bonobo_init (orb, NULL, NULL) == FALSE)
|
||||
g_error (_("Could not initialize Bonobo!"));
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
gst_init (&argc, &argv);
|
||||
/*
|
||||
* Setup the factory.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue