Changeset 119
- Timestamp:
- 09/09/06 16:38:46 (5 years ago)
- Files:
-
- 1 removed
- 5 modified
-
fm_gui/trunk/data/fm_djmixer.glade (modified) (6 diffs)
-
fm_gui/trunk/src/fm_djmixer_gui.c (modified) (2 diffs)
-
fm_gui/trunk/src/fm_djmixer_gui.h (modified) (1 diff)
-
fm_gui/trunk/src/tx_widgets/misc.h (deleted)
-
fm_server/trunk/src/fm_djmixer.c (modified) (3 diffs)
-
fm_server/trunk/src/fm_djmixer.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
fm_gui/trunk/data/fm_djmixer.glade
r118 r119 3 3 <!-- Generated with glade3 4 4 Version: 3.0.1 5 Date: Fri Sep 8 23:41:5820065 Date: Sat Sep 9 16:22:56 2006 6 6 User: ath 7 7 Host: sarge … … 17 17 <property name="spacing">3</property> 18 18 <child> 19 <widget class="GtkHBox" id="hbox_channels"> 20 </widget> 21 </child> 22 <child> 23 <widget class="GtkHBox" id="hbox12"> 19 <widget class="GtkVBox" id="vbox1"> 24 20 <property name="visible">True</property> 25 21 <child> 26 <widget class="Gtk VBox" id="vbox9">22 <widget class="GtkHBox" id="hbox3"> 27 23 <property name="visible">True</property> 28 <property name="spacing">3</property> 29 <child> 30 <widget class="GtkLabel" id="label22"> 31 <property name="visible">True</property> 32 <property name="xalign">0,000000</property> 33 <property name="yalign">0,000000</property> 34 <property name="label" translatable="yes"><small><b>Master</b></small></property> 35 <property name="use_markup">True</property> 36 </widget> 37 <packing> 38 <property name="expand">False</property> 39 <property name="fill">False</property> 40 </packing> 41 </child> 42 <child> 43 <widget class="GtkVBox" id="vbox10"> 24 <child> 25 <widget class="GtkHBox" id="hbox_channels"> 26 </widget> 27 </child> 28 <child> 29 <widget class="GtkHBox" id="hbox2"> 44 30 <property name="visible">True</property> 45 31 <child> 46 <widget class="GtkVBox" id="vbox 11">32 <widget class="GtkVBox" id="vbox5"> 47 33 <property name="visible">True</property> 48 <child> 49 <widget class="GtkVBox" id="vbox12"> 50 <property name="visible">True</property> 51 <child> 52 <widget class="GtkLabel" id="label23"> 53 <property name="visible">True</property> 54 <property name="xalign">0,000000</property> 34 <property name="spacing">3</property> 35 <child> 36 <widget class="GtkLabel" id="label3"> 37 <property name="visible">True</property> 38 <property name="xalign">0,000000</property> 39 <property name="yalign">0,000000</property> 40 <property name="label" translatable="yes"><small><b>Master</b></small></property> 41 <property name="use_markup">True</property> 42 </widget> 43 <packing> 44 <property name="expand">False</property> 45 <property name="fill">False</property> 46 </packing> 47 </child> 48 <child> 49 <widget class="GtkVBox" id="vbox9"> 50 <property name="visible">True</property> 51 <child> 52 <widget class="GtkVBox" id="vbox10"> 53 <property name="visible">True</property> 54 <child> 55 <widget class="GtkVBox" id="vbox11"> 56 <property name="visible">True</property> 57 <child> 58 <widget class="GtkLabel" id="label4"> 59 <property name="visible">True</property> 60 <property name="xalign">0,000000</property> 61 <property name="yalign">0,000000</property> 62 <property name="label" translatable="yes"><small>Level</small></property> 63 <property name="use_markup">True</property> 64 </widget> 65 <packing> 66 <property name="expand">False</property> 67 <property name="fill">False</property> 68 </packing> 69 </child> 70 <child> 71 <widget class="Custom" id="dial_master_level"> 72 <property name="width_request">50</property> 73 <property name="height_request">50</property> 74 <property name="visible">True</property> 75 <property name="creation_function">fm_djmixer_gui_create_dial</property> 76 </widget> 77 <packing> 78 <property name="expand">False</property> 79 <property name="position">1</property> 80 </packing> 81 </child> 82 </widget> 83 </child> 84 <child> 85 <widget class="GtkVBox" id="vbox12"> 86 <property name="visible">True</property> 87 <child> 88 <widget class="GtkLabel" id="label5"> 89 <property name="visible">True</property> 90 <property name="xalign">0,000000</property> 91 <property name="yalign">0,000000</property> 92 <property name="label" translatable="yes"><small>Cue level</small></property> 93 <property name="use_markup">True</property> 94 </widget> 95 <packing> 96 <property name="expand">False</property> 97 <property name="fill">False</property> 98 </packing> 99 </child> 100 <child> 101 <widget class="Custom" id="dial_cue_level"> 102 <property name="width_request">50</property> 103 <property name="height_request">50</property> 104 <property name="visible">True</property> 105 <property name="creation_function">fm_djmixer_gui_create_dial</property> 106 </widget> 107 <packing> 108 <property name="expand">False</property> 109 <property name="position">1</property> 110 </packing> 111 </child> 112 </widget> 113 <packing> 114 <property name="position">1</property> 115 </packing> 116 </child> 117 </widget> 118 <packing> 119 <property name="expand">False</property> 120 </packing> 121 </child> 122 <child> 123 <widget class="GtkAlignment" id="alignment6"> 124 <property name="visible">True</property> 55 125 <property name="yalign">0,000000</property> 56 <property name="label" translatable="yes"><small>Level</small></property> 57 <property name="use_markup">True</property> 58 </widget> 59 <packing> 60 <property name="expand">False</property> 61 <property name="fill">False</property> 62 </packing> 63 </child> 64 <child> 65 <widget class="Custom" id="dial_master_level"> 66 <property name="width_request">30</property> 67 <property name="height_request">40</property> 68 <property name="visible">True</property> 69 <property name="creation_function">fm_djmixer_gui_create_dial</property> 70 </widget> 71 <packing> 72 <property name="expand">False</property> 126 <property name="xscale">0,000000</property> 127 <child> 128 <widget class="Custom" id="flash_master"> 129 <property name="width_request">50</property> 130 <property name="visible">True</property> 131 <property name="creation_function">fm_djmixer_gui_create_flash</property> 132 </widget> 133 </child> 134 </widget> 135 <packing> 73 136 <property name="position">1</property> 74 137 </packing> 75 </child>76 </widget>77 </child>78 <child>79 <widget class="GtkVBox" id="vbox13">80 <property name="visible">True</property>81 <child>82 <widget class="GtkLabel" id="label24">83 <property name="visible">True</property>84 <property name="xalign">0,000000</property>85 <property name="yalign">0,000000</property>86 <property name="label" translatable="yes">label24</property>87 </widget>88 <packing>89 <property name="expand">False</property>90 <property name="fill">False</property>91 </packing>92 </child>93 <child>94 <placeholder/>95 138 </child> 96 139 </widget> … … 101 144 </widget> 102 145 </child> 103 <child>104 <placeholder/>105 </child>106 146 </widget> 107 147 <packing> … … 111 151 </widget> 112 152 </child> 153 <child> 154 <widget class="GtkHScale" id="hscale_xfader"> 155 <property name="visible">True</property> 156 <property name="adjustment">0 -1 1 0 0 0</property> 157 <property name="digits">3</property> 158 <property name="draw_value">False</property> 159 </widget> 160 <packing> 161 <property name="expand">False</property> 162 <property name="position">1</property> 163 </packing> 164 </child> 113 165 </widget> 114 <packing>115 <property name="position">1</property>116 </packing>117 166 </child> 118 167 <child> … … 130 179 <property name="xalign">0,000000</property> 131 180 <property name="yalign">0,000000</property> 132 <property name="label" translatable="yes">Status: connected</property>181 <property name="label" translatable="yes">Status:</property> 133 182 </widget> 134 183 <packing> … … 414 463 <packing> 415 464 <property name="expand">False</property> 416 <property name="position"> 2</property>465 <property name="position">1</property> 417 466 </packing> 418 467 </child> -
fm_gui/trunk/src/fm_djmixer_gui.c
r118 r119 43 43 gint int1, gint int2) 44 44 { 45 GtkWidget *wid = gtk_tx_flash_new (); 46 g_print ("Created flash widget %p\n", wid); 47 return wid; 45 return gtk_tx_flash_new (); 48 46 } 49 47 … … 93 91 94 92 gui->hbox_channels = glade_xml_get_widget(gui->xml_mixer, "hbox_channels"); 95 93 94 gui->dial_master_level = glade_xml_get_widget(gui->xml_mixer, "dial_master_level"); 95 gui->dial_cue_level = glade_xml_get_widget(gui->xml_mixer, "dial_cue_level"); 96 gui->flash_master = glade_xml_get_widget(gui->xml_mixer, "flash_master"); 97 96 98 fm_djmixer_gui_add_channel (gui, 0); 97 99 fm_djmixer_gui_add_channel (gui, 1); 100 101 gtk_widget_show_all (gui->dial_master_level); 102 gtk_widget_show_all (gui->dial_cue_level); 103 gtk_widget_show_all (gui->flash_master); 98 104 } 99 105 -
fm_gui/trunk/src/fm_djmixer_gui.h
r118 r119 26 26 GtkWidget *window_mixer; 27 27 GtkWidget *hbox_channels; 28 29 GtkWidget *dial_master_level; 30 GtkWidget *dial_cue_level; 31 GtkWidget *flash_master; 28 32 29 33 GList *channels; -
fm_server/trunk/src/fm_djmixer.c
r118 r119 124 124 125 125 djm->mixer = fm_mixer_new (); 126 djm->master_gain = fm_effect_gain_new (); 127 djm->master_level = fm_level_meter_new (); 128 fm_element_connect_src (FM_ELEMENT (djm->master_level), FM_ELEMENT (djm->master_gain)); 129 fm_element_connect_src (FM_ELEMENT (djm->master_gain), FM_ELEMENT (djm->mixer)); 126 130 } 127 131 … … 133 137 134 138 g_print ("starting FmDJMixer...\n"); 135 return fm_element_activate (FM_ELEMENT (djm->m ixer));139 return fm_element_activate (FM_ELEMENT (djm->master_level)); 136 140 } 137 141 … … 234 238 FmDJMixer *djm = FM_DJMIXER (element); 235 239 236 fm_element_get_buffer (FM_ELEMENT (djm->m ixer), buffer);237 } 240 fm_element_get_buffer (FM_ELEMENT (djm->master_level), buffer); 241 } -
fm_server/trunk/src/fm_djmixer.h
r118 r119 31 31 32 32 FmMixer *mixer; 33 FmEffectGain *master_gain; 34 FmLevelMeter *master_level; 33 35 34 36 guint total_ports;
