[SCM] gsequencer/upstream: fixed unsupported machines in editor
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:07:10 UTC 2015
The following commit has been merged in the upstream branch:
commit 6fe8496fe3cdd2584f5012b6ef5a39b7746709c0
Author: Joël Krähemann <jkraehemann at gmail.com>
Date: Sun Jun 14 17:56:10 2015 +0200
fixed unsupported machines in editor
diff --git a/README b/README
index 208e9d3..d87cbec 100644
--- a/README
+++ b/README
@@ -1,11 +1,5 @@
jkraehemann at gmail.com
-<<<<<<< HEAD
You need a realtime kernel in conjunction with ags in order to do more computing expensive synthesis.
Please visit http://rt.wiki.kernel.org for more information.
-=======
-You need a realtime kernel in conjunction with in order to do more computing expensive synthesis.
-
-See http://rt.wiki.kernel.org/ for more information.
->>>>>>> c031932f05a9dba5ead446cf7364029ff9efac44
diff --git a/src/ags/X/editor/ags_machine_selection.c b/src/ags/X/editor/ags_machine_selection.c
index 4ba2e95..390343f 100644
--- a/src/ags/X/editor/ags_machine_selection.c
+++ b/src/ags/X/editor/ags_machine_selection.c
@@ -20,6 +20,8 @@
#include <ags-lib/object/ags_connectable.h>
+#include <ags/X/machine/ags_ffplayer.h>
+
void ags_machine_selection_class_init(AgsMachineSelectionClass *machine_selection);
void ags_machine_selection_connectable_interface_init(AgsConnectableInterface *connectable);
void ags_machine_selection_init(AgsMachineSelection *machine_selection);
@@ -152,17 +154,19 @@ ags_machine_selection_run(AgsMachineSelection *machine_selection)
while(list != NULL){
GtkRadioButton *radio_button;
- radio_button = (GtkRadioButton *) gtk_radio_button_new_with_label_from_widget(group,
- g_strdup_printf("%s: %s\0", G_OBJECT_TYPE_NAME(list->data), AGS_MACHINE(list->data)->name));
- gtk_box_pack_start(GTK_BOX(vbox),
- GTK_WIDGET(radio_button),
- FALSE, FALSE,
- 0);
-
- if(group == NULL){
- group = radio_button;
+ if(AGS_IS_FFPLAYER(list->data)){
+ radio_button = (GtkRadioButton *) gtk_radio_button_new_with_label_from_widget(group,
+ g_strdup_printf("%s: %s\0", G_OBJECT_TYPE_NAME(list->data), AGS_MACHINE(list->data)->name));
+ gtk_box_pack_start(GTK_BOX(vbox),
+ GTK_WIDGET(radio_button),
+ FALSE, FALSE,
+ 0);
+
+ if(group == NULL){
+ group = radio_button;
+ }
}
-
+
list = list->next;
}
@@ -178,13 +182,16 @@ ags_machine_selection_run(AgsMachineSelection *machine_selection)
index = gtk_container_get_children((GtkContainer *) vbox);
while(index != NULL){
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(index->data))){
- machine = AGS_MACHINE(list->data);
-
- break;
+ if(AGS_IS_FFPLAYER(list->data)){
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(index->data))){
+ machine = AGS_MACHINE(list->data);
+
+ break;
+ }
+
+ index = index->next;
}
-
- index = index->next;
+
list = list->next;
}
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list