- Timestamp:
- 01/08/09 22:42:50 (3 years ago)
- Location:
- trunk/fm_gui/src
- Files:
-
- 2 modified
-
marlin-window-menu.c (modified) (8 diffs)
-
marlin-window.c (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/fm_gui/src/marlin-window-menu.c
r268 r279 78 78 }; 79 79 80 /* Command callback functions */81 /*static void82 file_new (GtkAction *action,83 gpointer data)84 {85 marlin_open_window (NULL, NULL, NULL, NULL);86 }*/87 88 /*static void89 file_new_dialog (GtkAction *action,90 gpointer data)91 {92 int rate, channels;93 94 if (marlin_new_sample_dialog_run (MARLIN_BASE_WINDOW (data),95 _("Create a new sample"),96 _("Create Sample"),97 &rate, &channels)) {98 marlin_open_window (NULL, NULL, NULL, NULL);99 }100 }*/101 102 /*static void103 file_open (GtkAction *action,104 gpointer data)105 {106 marlin_window_open (MARLIN_WINDOW (data));107 }*/108 109 /*static void110 file_open_recent (GtkAction *action,111 GtkRecentInfo *info,112 MarlinWindow *window)113 {114 marlin_open_window (gtk_recent_info_get_uri (info), NULL, NULL, NULL);115 }*/116 117 /*static void118 file_save (GtkAction *action,119 gpointer data)120 {121 MarlinWindow *window;122 123 window = MARLIN_WINDOW (data);124 125 marlin_window_save_sample (window);126 }*/127 128 /*static void129 file_save_as (GtkAction *action,130 gpointer data)131 {132 marlin_window_save_sample_as (MARLIN_WINDOW (data));133 }*/134 135 /*static void136 file_properties (GtkAction *action,137 gpointer data)138 {139 marlin_window_show_properties (MARLIN_WINDOW (data));140 }*/141 142 80 static void 143 81 file_close (GtkAction *action, … … 147 85 } 148 86 149 /*static void G_GNUC_UNUSED150 file_quit (GtkAction *action,151 gpointer data)152 {153 marlin_quit ();154 }*/155 87 156 88 static void … … 160 92 marlin_display_help (NULL); 161 93 } 94 162 95 163 96 static void … … 296 229 297 230 static void 298 media_record (GtkAction *action,299 gpointer data)300 {301 /*static GtkWidget *dialog = NULL;302 303 if (dialog == NULL) {304 dialog = marlin_record_new (GTK_WINDOW (data));305 g_signal_connect (G_OBJECT (dialog), "destroy",306 G_CALLBACK (gtk_widget_destroyed), &dialog);307 } else {308 gdk_window_raise (dialog->window);309 gdk_window_show (dialog->window);310 }*/311 }312 313 static void314 231 edit_history (GtkAction *action, 315 232 gpointer data) … … 354 271 marlin_window_mix (MARLIN_WINDOW (data)); 355 272 } 356 357 /*static void358 edit_xfade (GtkAction *action,359 gpointer data)360 {361 MarlinWindow *window = (MarlinWindow *) data;362 MarlinSample *sample;363 MarlinSampleSelection *selection;364 MarlinCoverage coverage;365 366 sample = marlin_base_window_get_sample (MARLIN_BASE_WINDOW (data));367 g_object_get (G_OBJECT (sample),368 "selection", &selection,369 NULL);370 371 marlin_sample_selection_get (selection, &coverage, NULL, NULL);372 g_object_unref (selection);373 374 if (coverage == MARLIN_COVERAGE_NONE) {375 marlin_window_xfade (window);376 } else {377 marlin_window_xfade_selection (window);378 }379 }*/380 381 /*static void382 edit_paste_new (GtkAction *action,383 gpointer data)384 {385 MarlinProgram *program = marlin_program_get_default ();386 MarlinSample *sample, *copy;387 GError *error = NULL;388 389 sample = MARLIN_SAMPLE (marlin_program_get_clipboard (program));390 391 // Copy sample392 copy = marlin_sample_new_from_sample (sample, &error);393 if (copy == NULL) {394 g_warning ("marlin_sample_new_from_sample failed");395 return;396 }397 398 // Dirty the copy399 g_object_set (G_OBJECT (copy),400 "dirty", TRUE,401 NULL);402 403 marlin_open_window_with_sample (copy);404 }*/405 273 406 274 static void … … 631 499 }*/ 632 500 633 /*static void634 toolbar_editor_destroy_cb (GtkWidget *tbe,635 Toolbar *t)636 {637 egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (t), FALSE);638 }*/639 640 /*static void641 toolbar_editor_response_cb (GtkDialog *dialog,642 gint response_id,643 gpointer data)644 {645 EphyToolbarsModel *model;646 int position;647 648 switch (response_id) {649 case GTK_RESPONSE_CLOSE:650 gtk_widget_destroy (GTK_WIDGET (dialog));651 break;652 653 case RESPONSE_ADD_TOOLBAR:654 model = marlin_get_toolbars_model ();655 position = egg_toolbars_model_add_toolbar (EGG_TOOLBARS_MODEL (model),656 -1, "UserCreated");657 egg_toolbars_model_set_flags (EGG_TOOLBARS_MODEL (model),658 EGG_TB_MODEL_ICONS_ONLY,659 position);660 break;661 662 case GTK_RESPONSE_HELP:663 break;664 }665 }*/666 667 /*static void668 edit_toolbars (GtkAction *action,669 gpointer data)670 {671 GtkWidget *editor, *dialog;672 EphyToolbarsModel *model;673 Toolbar *toolbar;674 GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;675 char *xml;676 677 toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));678 model = marlin_get_toolbars_model ();679 680 dialog = gtk_dialog_new ();681 gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);682 gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));683 gtk_window_set_transient_for (GTK_WINDOW (dialog),684 GTK_WINDOW (data));685 686 editor = egg_toolbar_editor_new (ui_manager, EGG_TOOLBARS_MODEL (model));687 688 xml = marlin_file ("toolbars.xml");689 egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor), xml);690 g_free (xml);691 gtk_container_set_border_width (GTK_CONTAINER (editor), 6);692 gtk_box_set_spacing (GTK_BOX (editor), 6);693 gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);694 g_signal_connect (editor, "destroy",695 G_CALLBACK (toolbar_editor_destroy_cb), toolbar);696 gtk_widget_show (editor);697 698 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);699 gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);700 gtk_dialog_add_button (GTK_DIALOG (dialog),701 _("Add a New Toolbar"),702 RESPONSE_ADD_TOOLBAR);703 gtk_dialog_add_button (GTK_DIALOG (dialog),704 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);705 gtk_dialog_add_button (GTK_DIALOG (dialog),706 GTK_STOCK_HELP, GTK_RESPONSE_HELP);707 708 g_signal_connect (G_OBJECT (dialog), "response",709 G_CALLBACK (toolbar_editor_response_cb), NULL);710 gtk_widget_show (dialog);711 712 egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (toolbar), TRUE);713 }*/714 715 /*static void716 process_mute (GtkAction *action,717 gpointer data)718 {719 marlin_window_clear (MARLIN_WINDOW (data));720 }*/721 722 /*static void723 process_invert (GtkAction *action,724 gpointer data)725 {726 marlin_window_invert (MARLIN_WINDOW (data));727 }*/728 729 /*static void730 process_swap_channels (GtkAction *action,731 gpointer data)732 {733 MarlinSample *sample;734 MarlinUndoManager *undo;735 MarlinUndoContext *ctxt;736 737 g_object_get (G_OBJECT (data),738 "sample", &sample,739 NULL);740 g_object_get (G_OBJECT (sample),741 "undo-manager", &undo,742 NULL);743 744 ctxt = marlin_undo_manager_context_begin (undo, _("Swap Channels"));745 746 marlin_sample_swap_channels (sample, NULL, ctxt, NULL);747 marlin_undo_manager_context_end (undo, ctxt);748 g_object_unref (G_OBJECT (undo));749 g_object_unref (G_OBJECT (sample));750 }*/751 752 /*static void753 process_adjust_volume (GtkAction *action,754 gpointer data)755 {756 marlin_window_adjust_volume (MARLIN_WINDOW (data));757 }*/758 759 /*static void760 process_insert_silence (GtkAction *action,761 gpointer data)762 {763 marlin_window_insert_silence (MARLIN_WINDOW (data));764 }*/765 766 /*static void767 process_change_channels (GtkAction *action,768 gpointer data)769 {770 marlin_window_change_channels (MARLIN_WINDOW (data));771 }*/772 773 /*static void774 process_split_sample (GtkAction *action,775 gpointer data)776 {777 marlin_window_split_sample (MARLIN_WINDOW (data));778 }*/779 780 /*static void781 process_reverse_sample (GtkAction *action,782 MarlinWindow *window)783 {784 marlin_window_reverse_sample (window);785 }*/786 501 787 502 static void … … 821 536 }*/ 822 537 823 /*static void824 view_clipboard_info (GtkAction *action,825 gpointer data)826 {827 static MarlinClipboardInfo *info = NULL;828 829 if (info == NULL) {830 info = marlin_clipboard_info_new (GTK_WINDOW (data));831 832 g_signal_connect (G_OBJECT (info->dialog), "destroy",833 G_CALLBACK (destroy_info_cb), &info);834 gtk_widget_show (info->dialog);835 } else {836 gtk_window_present (GTK_WINDOW (info->dialog));837 }838 }*/839 840 538 static void 841 539 view_centre (GtkAction *action, … … 865 563 marlin_window_show_equalizers (MARLIN_WINDOW (data), 866 564 gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); 867 }*/868 869 /*static void870 view_new (GtkAction *action,871 MarlinWindow *window)872 {873 MarlinSample *sample;874 875 g_object_get (G_OBJECT (window),876 "sample", &sample,877 NULL);878 879 marlin_open_window_with_sample (sample);880 g_object_unref (G_OBJECT (sample));881 }*/882 883 /* FIXME: All these displays should use the same gconf key,884 and one place sets it and they all pay attention to it. */885 /*static void886 scale_action_changed (GtkAction *action,887 GtkRadioAction *current,888 MarlinWindow *window)889 {890 MarlinScale scale;891 892 scale = gtk_radio_action_get_current_value (current);893 marlin_window_set_level_display (window, scale);894 marlin_window_set_meters_display (window, scale);895 565 }*/ 896 566 -
trunk/fm_gui/src/marlin-window.c
r272 r279 40 40 #include <libgnomevfs/gnome-vfs-mime.h> 41 41 42 //#include <gconf/gconf-client.h>43 44 #ifdef HAVE_MEDIA_PROFILES45 #include <profiles/gnome-media-profiles.h>46 #endif47 48 42 #include <marlin/marlin-sample.h> 49 43 #include <marlin/marlin-sample-selection.h> … … 53 47 54 48 #include <marlin/marlin-load-pipeline.h> 55 //#include <marlin/marlin-save-pipeline.h>56 //#include <marlin/marlin-jack-play.h>57 49 58 50 #include <marlin/marlin-file-utils.h> … … 65 57 #include <marlin/marlin-a11y-helper.h> 66 58 #include <marlin/marlin-x-utils.h> 67 //#include <marlin/marlin-cross-fader.h>68 59 #include <marlin/marlin-undo-manager.h> 69 60 #include <marlin/marlin-level-ruler.h> 70 //#include <marlin/marlin-plugin.h>71 61 #include <marlin/marlin-base-window.h> 72 62 #include <marlin/marlin-progress-dialog.h> 73 63 #include <marlin/marlin-gst-extras.h> 74 //#include <marlin/marlin-file-chooser.h> 75 76 /*#include <dialogs/marlin-information-dialog.h> 77 #include <dialogs/marlin-adjust-channel-dialogs.h> 78 #include <dialogs/marlin-mp3-dialog.h> 79 #include <dialogs/marlin-vorbis-dialog.h> 80 81 #include <dialogs/marlin-crossfade-dialog.h> 82 #include <dialogs/marlin-select-region-dialog.h> 83 #include <dialogs/marlin-undo-history-dialog.h> 84 #include <dialogs/marlin-edit-marker-dialog.h> 85 #include <dialogs/marlin-add-marker-dialog.h> 86 #include <dialogs/marlin-move-cursor-dialog.h>*/ 64 87 65 88 66 #include <marlin/marlin-beatsection-model.h> 89 67 90 68 //#include <other/gtkvumeter.h> 91 92 //#include <marlin-toolbar.h>93 94 //#include "main.h"95 69 96 70 #include "global.h" … … 106 80 PROP_0, 107 81 PROP_SAMPLE, 82 PROP_CDJ 108 83 }; 109 84 … … 168 143 GtkActionGroup *ui_action, *popup_action; 169 144 GObject *ui_merge; 170 171 // MarlinJackPlay *jack;172 145 173 146 MarlinState state; … … 184 157 guint clip_id; /* Signal handler for listening to the clipboard */ 185 158 186 /* Dialogs */187 GtkWidget *select_region_dialog;188 GtkWidget *move_cursor_dialog;189 GtkWidget *properties_dialog;190 GtkWidget *xfade_dialog;191 GtkWidget *adjust_channels_dialog;192 GtkWidget *undo_history_dialog;193 GtkWidget *edit_marker_dialog;194 GtkWidget *add_marker_dialog;195 196 time_t last_save; /* Time of the last save, in seconds */197 198 159 GtkWidget *meters_event; /* Event box that holds the meters */ 199 160 GtkWidget *left_vu, *right_vu; … … 202 163 gboolean mv_in_marker; 203 164 MarlinMarker *current_marker; 165 166 // FmCDJData *cdj; 204 167 }; 205 168 … … 250 213 } 251 214 252 /* if (priv->select_region_dialog != NULL) {253 gtk_widget_destroy (priv->select_region_dialog);254 }*/255 256 /* if (priv->move_cursor_dialog != NULL) {257 gtk_widget_destroy (priv->move_cursor_dialog);258 }*/259 260 /* if (priv->properties_dialog != NULL) {261 gtk_widget_destroy (priv->properties_dialog);262 }*/263 264 /* if (priv->undo_history_dialog != NULL) {265 gtk_widget_destroy (priv->undo_history_dialog);266 }*/267 268 /* if (priv->xfade_dialog != NULL) {269 gtk_widget_destroy (priv->xfade_dialog);270 }*/271 272 /* if (priv->adjust_channels_dialog != NULL) {273 gtk_widget_destroy (priv->adjust_channels_dialog);274 }*/275 276 215 g_free (priv); 277 216 window->priv = NULL; … … 328 267 } 329 268 #endif 330 /* if (priv->jack != NULL) {331 g_object_unref (priv->jack);332 priv->jack = NULL;333 }*/334 269 335 270 if (priv->undo != NULL) { … … 792 727 MarlinWindowPrivate *priv; 793 728 GtkUIManager *merge; 794 // GConfClient *client;795 // GList *plugins;796 729 char *xml; 797 730 … … 816 749 FALSE, TRUE, 0); 817 750 818 /* client = gconf_client_get_default ();819 priv->position_display = gconf_client_get_int (client,820 "/apps/marlin/system-state/position-display",821 NULL);822 priv->show_vu = gconf_client_get_bool (client,823 "/apps/marlin/show-equalizers",824 NULL);825 g_object_unref (G_OBJECT (client));*/826 827 751 priv->close_on_op_complete = FALSE; 828 752 priv->state = MARLIN_STATE_STOPPED; … … 856 780 g_free (xml); 857 781 858 /* Merge all the plugins */859 /*for (plugins = marlin_plugin_get_list (); plugins; plugins = plugins->next) {860 MarlinPluginInfo *info = plugins->data;861 MarlinPluginFuncs *funcs = info->funcs;862 863 if (funcs->merge_ui) {864 funcs->merge_ui (merge, MARLIN_BASE_WINDOW (window));865 }866 }*/867 868 782 priv->accel_group = gtk_ui_manager_get_accel_group (merge); 869 783 gtk_window_add_accel_group (GTK_WINDOW (window), priv->accel_group); … … 872 786 g_object_unref (priv->accel_group); 873 787 874 /* priv->toolbar = toolbar_new (window);875 gtk_widget_show (GTK_WIDGET (priv->toolbar));876 gtk_box_pack_end (GTK_BOX (priv->menu_dock), GTK_WIDGET (priv->toolbar),877 FALSE, FALSE, 0);*/878 879 priv->last_save = time (NULL);880 788 } 881 789 … … 1509 1417 } 1510 1418 1511 /*static void1512 display_no_jack_window (GtkWidget *window)1513 {1514 GtkWidget *dialog;1515 1516 dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (window),1517 GTK_DIALOG_MODAL |1518 GTK_DIALOG_DESTROY_WITH_PARENT,1519 GTK_MESSAGE_WARNING,1520 GTK_BUTTONS_OK,1521 _("<b>Unable to start JACK</b>"));1522 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),1523 _("Marlin requires JACK for its audio output, but JACK failed to start.\n\n"1524 "Marlin will continue to run, but playback and recording features will be disabled"));1525 gtk_dialog_run (GTK_DIALOG (dialog));1526 1527 gtk_widget_destroy (dialog);1528 }*/1529 1419 1530 1420 MarlinWindow * 1531 marlin_window_new ( void)1421 marlin_window_new () 1532 1422 { 1533 1423 MarlinProgram *program = marlin_program_get_default ();
