mirror of
https://github.com/game-stop/veejay.git
synced 2025-12-21 23:30:00 +01:00
sliders and scroll event, fix multitrack double click, ui fixes
git-svn-id: svn://code.dyne.org/veejay/trunk@1185 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
@@ -9,7 +9,6 @@
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="default_width">900</property>
|
||||
<property name="default_height">640</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="icon">veejay-icon.png</property>
|
||||
@@ -2399,58 +2398,6 @@
|
||||
<property name="scrollable">False</property>
|
||||
<property name="enable_popup">False</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkScrolledWindow" id="scrolledwindow43">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTreeView" id="tree_sources">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="headers_visible">True</property>
|
||||
<property name="rules_hint">False</property>
|
||||
<property name="reorderable">False</property>
|
||||
<property name="enable_search">True</property>
|
||||
<property name="fixed_height_mode">False</property>
|
||||
<property name="hover_selection">False</property>
|
||||
<property name="hover_expand">False</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label890">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>mixing sources</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">tab</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox529">
|
||||
<property name="visible">True</property>
|
||||
@@ -2660,6 +2607,95 @@
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkScrolledWindow" id="scrolledwindow43">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkViewport" id="viewport8">
|
||||
<property name="visible">True</property>
|
||||
<property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox624">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTreeView" id="tree_sources">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="headers_visible">True</property>
|
||||
<property name="rules_hint">False</property>
|
||||
<property name="reorderable">False</property>
|
||||
<property name="enable_search">True</property>
|
||||
<property name="fixed_height_mode">False</property>
|
||||
<property name="hover_selection">False</property>
|
||||
<property name="hover_expand">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="samplemix_hbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label890">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>mixing sources</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">tab</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkScrolledWindow" id="scrolledwindow40">
|
||||
<property name="visible">True</property>
|
||||
@@ -6241,8 +6277,8 @@
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
@@ -11728,403 +11764,6 @@ MLZO</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox617">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox888">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="frame299">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment505">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">12</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox840">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macrostop">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Pause event playback</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">True</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_macrostop_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:31 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2623">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macropause.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macrorecord">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start recording events (keyboard and user interface)</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">macrostop</property>
|
||||
<signal name="toggled" handler="on_macrorecord_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:26 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image3022">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macrorec.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macroplay">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start playing recorded events</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">macrostop</property>
|
||||
<signal name="toggled" handler="on_macroplay_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:20 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2622">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macroplay.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="macroclear">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Clear recorded events</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_macroclear_clicked" last_modification_time="Sun, 01 Apr 2007 14:10:42 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment486">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox839">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2621">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macroclear.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label875">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"></property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label943">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Keystroke Recorder</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="frame284">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment490">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">12</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="sample_randomizer">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox709">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkCheckButton" id="freestyle">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Randomize sample duration, free cut-off</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Free Style</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_HALF</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkToggleButton" id="samplerand">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start / Stop randomizer</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_HALF</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<signal name="toggled" handler="on_samplerand_toggled" last_modification_time="Fri, 17 Jun 2005 17:02:39 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2544">
|
||||
<property name="width_request">20</property>
|
||||
<property name="height_request">20</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">button_rand.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label930">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Sample Randomizer</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label928">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Tools</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">tab</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox498">
|
||||
<property name="visible">True</property>
|
||||
@@ -12975,14 +12614,326 @@ MLZO</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="quickselect">
|
||||
<widget class="GtkHBox" id="hbox891">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox892">
|
||||
<property name="height_request">32</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<placeholder/>
|
||||
<widget class="GtkFrame" id="frame299">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment505">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">12</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox840">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macrostop">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Pause event playback</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">True</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_macrostop_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:31 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2623">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macropause.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macrorecord">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start recording events (keyboard and user interface)</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">macrostop</property>
|
||||
<signal name="toggled" handler="on_macrorecord_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:26 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image3022">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macrorec.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="macroplay">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start playing recorded events</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">macrostop</property>
|
||||
<signal name="toggled" handler="on_macroplay_toggled" last_modification_time="Sun, 01 Apr 2007 14:10:20 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2622">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macroplay.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="macroclear">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Clear recorded events</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_macroclear_clicked" last_modification_time="Sun, 01 Apr 2007 14:10:42 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment486">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox839">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2621">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">icon_macroclear.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label875">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"></property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="frame284">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment490">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">12</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="sample_randomizer">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox709">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkCheckButton" id="freestyle">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Randomize sample duration, free cut-off</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Free Style</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_HALF</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkToggleButton" id="samplerand">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Start / Stop randomizer</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_HALF</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<signal name="toggled" handler="on_samplerand_toggled" last_modification_time="Fri, 17 Jun 2005 17:02:39 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2544">
|
||||
<property name="width_request">20</property>
|
||||
<property name="height_request">20</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">button_rand.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
@@ -12998,7 +12949,7 @@ MLZO</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
@@ -13031,17 +12982,38 @@ MLZO</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox893">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox871">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox890">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkStatusbar" id="statusbar">
|
||||
<property name="width_request">800</property>
|
||||
<property name="height_request">18</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="has_resize_grip">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
@@ -13099,6 +13071,32 @@ MLZO</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="quickselect">
|
||||
<property name="width_request">200</property>
|
||||
<property name="height_request">32</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2555,10 +2555,14 @@ void on_previewtoggle_toggled(GtkWidget *w, gpointer user_data)
|
||||
multitrack_toggle_preview( info->mt, -1, is_button_toggled("previewtoggle"),
|
||||
glade_xml_get_widget(info->main_window, "imageA") );
|
||||
}
|
||||
else {
|
||||
multitrack_toggle_preview( info->mt, -1, 1, glade_xml_get_widget(info->main_window,"imageA")); //@ enable
|
||||
}
|
||||
setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW );
|
||||
multitrack_set_quality( info->mt, info->quality );
|
||||
|
||||
multitrack_toggle_preview( info->mt,
|
||||
-1,
|
||||
1,
|
||||
glade_xml_get_widget(info->main_window,"imageA")); //@ enable
|
||||
|
||||
// setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW );
|
||||
}
|
||||
|
||||
void on_previewspeed_value_changed( GtkWidget *widget, gpointer user_data)
|
||||
@@ -3518,7 +3522,7 @@ gboolean boxgreen_expose_event(GtkWidget *w,
|
||||
GdkColor col;
|
||||
|
||||
memset( &col,0, sizeof( GdkColor ) );
|
||||
col.green = 255 * get_slider_val( "textcolorgreen" );
|
||||
col.green = 0xff * get_slider_val( "textcolorgreen" );
|
||||
|
||||
gdk_color_alloc( gtk_widget_get_colormap( w ), &col );
|
||||
|
||||
|
||||
@@ -155,6 +155,7 @@ gboolean gveejay_idle(gpointer data)
|
||||
update_gveejay();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if( gveejay_restart() )
|
||||
|
||||
@@ -820,6 +820,8 @@ void *multitrack_new(
|
||||
mt->master_track = 0;
|
||||
|
||||
mt->preview = gvr_preview_init( MAX_TRACKS, threads );
|
||||
// gvr_set_master( mt->preview, mt->master_track );
|
||||
|
||||
|
||||
parent__ = infog;
|
||||
|
||||
@@ -922,8 +924,8 @@ int multrack_audoadd( void *data, char *hostname, int port_num )
|
||||
}
|
||||
}
|
||||
|
||||
mt->master_track = track;
|
||||
gvr_set_master( mt->preview, track );
|
||||
// mt->master_track = track;
|
||||
// gvr_set_master( mt->preview, track );
|
||||
|
||||
gtk_widget_set_sensitive_(GTK_WIDGET(mt->view[track]->panel), TRUE );
|
||||
|
||||
@@ -973,7 +975,6 @@ void multitrack_set_quality( void *data , int quality )
|
||||
|
||||
int w = 0;
|
||||
int h = 0;
|
||||
|
||||
switch( quality )
|
||||
{
|
||||
case 1:
|
||||
@@ -1082,7 +1083,7 @@ static gboolean seqv_mouse_press_event ( GtkWidget *w, GdkEventButton *event, gp
|
||||
sequence_view_t *v = (sequence_view_t*) user_data;
|
||||
multitracker_t *mt = v->backlink;
|
||||
|
||||
if(event->type == GDK_2BUTTON_PRESS)
|
||||
if(event->type == GDK_BUTTON_PRESS)
|
||||
{
|
||||
if( !gvr_track_test( mt->preview , v->num ) )
|
||||
return FALSE;
|
||||
@@ -1102,6 +1103,15 @@ static gboolean seqv_mouse_press_event ( GtkWidget *w, GdkEventButton *event, gp
|
||||
}
|
||||
|
||||
vj_gui_cb( 0, host, port );
|
||||
|
||||
gvr_set_master( mt->preview, v->num );
|
||||
if(!gvr_track_configure( mt->preview, v->num, mt->pw,mt->ph) )
|
||||
{
|
||||
veejay_msg(0, "Unable to configure preview %d x %d",mt->pw , mt->ph );
|
||||
}
|
||||
veejay_msg(VEEJAY_MSG_INFO, "Set master to track %d", mt->master_track );
|
||||
mt->master_track = v->num;
|
||||
|
||||
vj_gui_enable();
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ static struct
|
||||
{
|
||||
{"Mouse left: Set in point, Mouse right: Set out point, Double click: Clear selected, Mouse middle: Drag selection"},
|
||||
{"Mouse left/right: Play slot, Shift + Mouse left: Put sample in slot"},
|
||||
{"Mouse left click: Select slot (sample in slot), Mouse double click: Play sample in slot"},
|
||||
{"Mouse left click: Select slot (sample in slot), Mouse double click: Play sample in slot, Mouse left + SHIFT: Set slot as mixing current mixing channel"},
|
||||
{NULL},
|
||||
};
|
||||
|
||||
@@ -578,10 +578,9 @@ static void reload_bundles();
|
||||
static void update_rgbkey_from_slider();
|
||||
static gchar *get_textview_buffer(const char *name);
|
||||
static void create_slot(gint bank_nr, gint slot_nr, gint w, gint h);
|
||||
static void setup_samplebank(gint c, gint r);
|
||||
static void setup_samplebank(gint c, gint r, GtkWidget *pad, gint *image_w, gint *image_h);
|
||||
static int add_sample_to_sample_banks( int bank_page,sample_slot_t *slot );
|
||||
static void update_sample_slot_data(int bank_num, int slot_num, int id, gint sample_type, gchar *title, gchar *timecode);
|
||||
static gboolean on_slot_activated_by_key (GtkWidget *widget, GdkEventKey *event, gpointer user_data);
|
||||
static gboolean on_slot_activated_by_mouse (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
|
||||
static sample_slot_t *vj_gui_get_sample_info(gint which_one, gint mode );
|
||||
static void add_sample_to_effect_sources_list(gint id, gint type, gchar *title, gchar *timecode);
|
||||
@@ -609,7 +608,18 @@ static void set_textview_buffer(const char *name, gchar *utf8text);
|
||||
void interrupt_cb();
|
||||
//static gboolean update_log(gpointer data);
|
||||
|
||||
static struct
|
||||
{
|
||||
const char *text;
|
||||
} text_msg_[] =
|
||||
{
|
||||
{ "Running realtime" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
enum {
|
||||
TEXT_REALTIME = 0
|
||||
};
|
||||
|
||||
static struct
|
||||
{
|
||||
@@ -691,6 +701,7 @@ static struct
|
||||
{"button_sampleend"},
|
||||
{"speed_slider"},
|
||||
{"vjframerate"},
|
||||
{"markerframe"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
@@ -712,6 +723,7 @@ static struct
|
||||
{"vjframerate"},
|
||||
{"scrolledwindow49"}, // srt stuff
|
||||
{"samplegrid_frame"},
|
||||
{"markerframe"},
|
||||
{"NULL"}
|
||||
};
|
||||
|
||||
@@ -793,7 +805,7 @@ GtkWidget *glade_xml_get_widget_( GladeXML *m, const char *name )
|
||||
void gtk_widget_set_size_request__( GtkWidget *w, gint iw, gint h, const char *f, int line )
|
||||
{
|
||||
#ifdef STRICT_CHECKING
|
||||
veejay_msg(0, "%s: %dx%d from %s:%d", __FUNCTION__, iw,h,f,line);
|
||||
// veejay_msg(0, "%s: %dx%d from %s:%d", __FUNCTION__, iw,h,f,line);
|
||||
#endif
|
||||
gtk_widget_set_size_request(w, iw, h );
|
||||
}
|
||||
@@ -1553,7 +1565,7 @@ void about_dialog()
|
||||
GtkWidget *about = g_object_new(
|
||||
GTK_TYPE_ABOUT_DIALOG,
|
||||
"program_name", "reloaded",
|
||||
"name", "reloaded",
|
||||
"name", "Reloaded",
|
||||
"version", VERSION,
|
||||
"copyright", "(C) 2004 - 2008 N. Elburg et all.",
|
||||
"comments", "The graphical interface for Veejay",
|
||||
@@ -2460,7 +2472,11 @@ static void update_label_str(const char *name, gchar *text)
|
||||
{
|
||||
GtkWidget *label = glade_xml_get_widget_(
|
||||
info->main_window, name);
|
||||
#ifdef STRICT_CHECKING
|
||||
assert( label != NULL );
|
||||
#else
|
||||
if(!label ||!text) return;
|
||||
#endif
|
||||
gchar *utf8_text = _utf8str( text );
|
||||
if(!utf8_text) return;
|
||||
gtk_label_set_text( GTK_LABEL(label), utf8_text);
|
||||
@@ -4951,7 +4967,6 @@ static void disable_widget_(const char *name, const char *s, int line)
|
||||
veejay_msg(0, "Widget '%s' not found, caller is %s:%d",name,s,line);
|
||||
return;
|
||||
}
|
||||
veejay_msg(2, "disable '%s' from %s:%d", name,s,line);
|
||||
gtk_widget_set_sensitive_( GTK_WIDGET(w), FALSE );
|
||||
}
|
||||
|
||||
@@ -4962,8 +4977,6 @@ static void enable_widget_(const char *name, const char *s, int line)
|
||||
veejay_msg(0, "Widget '%s' not found, caller is %s:%d",name,s,line);
|
||||
return;
|
||||
}
|
||||
veejay_msg(2, "enable '%s' from %s:%d", name,s,line);
|
||||
|
||||
gtk_widget_set_sensitive_( GTK_WIDGET(w), TRUE );
|
||||
}
|
||||
#endif
|
||||
@@ -4985,20 +4998,21 @@ static gchar *format_selection_time(int start, int end)
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
static gboolean update_cpumeter_timeout( gpointer data )
|
||||
{
|
||||
gdouble ms = (gdouble)info->status_tokens[ELAPSED_TIME];
|
||||
gdouble fs = (gdouble)get_slider_val( "framerate" );
|
||||
|
||||
|
||||
gdouble lim = (1.0f/fs)*1000.0;
|
||||
char text[65];
|
||||
if( ms < lim )
|
||||
sprintf(text, "Running realtime" );
|
||||
else
|
||||
sprintf(text, "%2.2f FPS", ( 1.0 / ms ) * 1000.0 );
|
||||
update_label_str( "cpumeter", text );
|
||||
|
||||
if( ms < lim ) {
|
||||
update_label_str( "cpumeter", text_msg_[TEXT_REALTIME].text );
|
||||
} else {
|
||||
char text[32];
|
||||
sprintf(text, "%2.2f FPS", ( 1.0f / ms ) * 1000.0 );
|
||||
|
||||
update_label_str( "cpumeter", text );
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
static gboolean update_cachemeter_timeout( gpointer data )
|
||||
@@ -5360,6 +5374,11 @@ int veejay_update_multitrack( void *data )
|
||||
vj_gui_t *gui = (vj_gui_t*) data;
|
||||
sync_info *s = multitrack_sync( gui->mt );
|
||||
|
||||
if( s->status_list[s->master] == NULL ) {
|
||||
info->watch.w_state = STATE_STOPPED;
|
||||
return 1;
|
||||
}
|
||||
|
||||
GtkWidget *maintrack = glade_xml_get_widget( info->main_window, "imageA");
|
||||
int i;
|
||||
GtkWidget *ww = glade_xml_get_widget_( info->main_window, "notebook18" );
|
||||
@@ -5416,14 +5435,6 @@ int veejay_update_multitrack( void *data )
|
||||
assert( s->heights[i] > 0 );
|
||||
assert( GDK_IS_PIXBUF( s->img_list[i] ) );
|
||||
#endif
|
||||
// GdkPixbuf *result = vj_gdk_pixbuf_scale_simple( s->img_list[i],352,288, GDK_INTERP_NEAREST );
|
||||
// gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), result );
|
||||
// gdk_pixbuf_unref(result);
|
||||
|
||||
// GdkPixbuf *result = vj_gdk_pixbuf_scale_simple( s->img_list[i],352,288, 0 );
|
||||
// gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), result );
|
||||
// gdk_pixbuf_unref(result);
|
||||
|
||||
if( gdk_pixbuf_get_height(s->img_list[i]) >= 255 ||
|
||||
gdk_pixbuf_get_width(s->img_list[i]) >= 320 )
|
||||
gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), s->img_list[i] );
|
||||
@@ -5437,14 +5448,6 @@ int veejay_update_multitrack( void *data )
|
||||
|
||||
vj_img_cb( s->img_list[i] );
|
||||
}
|
||||
// }
|
||||
/* else
|
||||
{
|
||||
GdkPixbuf *result = vj_gdk_pixbuf_scale_simple( s->img_list[i],preview_box_w_,preview_box_h_, 0 );
|
||||
gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), result );
|
||||
gdk_pixbuf_unref(result);
|
||||
}*/
|
||||
// vj_img_cb( s->img_list[i] );
|
||||
|
||||
if(deckpage == 3)
|
||||
multitrack_update_sequence_image( gui->mt, i, s->img_list[i] );
|
||||
@@ -5624,13 +5627,13 @@ static void update_globalinfo(int *history, int pm, int last_pm)
|
||||
update_spin_range(
|
||||
"button_el_selpaste", 0, total_frames_, info->selection[2]);
|
||||
}
|
||||
|
||||
veejay_msg(0, "%s",time);
|
||||
update_label_i( "label_totframes", total_frames_, 1 );
|
||||
update_label_str( "label_totaltime", time );
|
||||
if(pm == MODE_SAMPLE)
|
||||
update_label_str( "label_samplelength", time );
|
||||
update_label_str( "sample_length_label", time );
|
||||
else
|
||||
update_label_str( "label_samplelength", "0:00:00:00" );
|
||||
update_label_str( "sample_length_label", "0:00:00:00" );
|
||||
|
||||
|
||||
timeline_set_length( info->tl,
|
||||
@@ -6249,6 +6252,64 @@ void vj_gui_wipe()
|
||||
|
||||
}
|
||||
|
||||
GtkWidget *new_bank_pad(GtkWidget *box, int type)
|
||||
{
|
||||
GtkWidget *pad = info->sample_bank_pad = gtk_notebook_new();
|
||||
gtk_notebook_set_tab_pos( GTK_NOTEBOOK(pad), GTK_POS_BOTTOM );
|
||||
gtk_notebook_set_show_tabs( GTK_NOTEBOOK(pad ), FALSE );
|
||||
gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET(pad), TRUE, TRUE, 0);
|
||||
|
||||
if( type == 0 ) {
|
||||
setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW, pad, &(info->image_dimensions[0]),
|
||||
&(info->image_dimensions[1]) );
|
||||
}
|
||||
|
||||
return pad;
|
||||
}
|
||||
static struct {
|
||||
const char *text;
|
||||
} slider_names_[] =
|
||||
{
|
||||
{ "slider_p0" },
|
||||
{ "slider_p1" },
|
||||
{ "slider_p2" },
|
||||
{ "slider_p3" },
|
||||
{ "slider_p4" },
|
||||
{ "slider_p5" },
|
||||
{ "slider_p6" },
|
||||
{ "slider_p7" },
|
||||
{ "slider_p8" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
gboolean slider_scroll_event( GtkWidget *widget, GdkEventScroll *ev, gpointer user_data)
|
||||
{
|
||||
gint i = GPOINTER_TO_INT(user_data);
|
||||
if(ev->direction == GDK_SCROLL_UP ) {
|
||||
param_changed( i, 1, slider_names_[i].text );
|
||||
} else if (ev->direction == GDK_SCROLL_DOWN ) {
|
||||
param_changed( i, -1, slider_names_[i].text );
|
||||
}
|
||||
veejay_msg(0, "%s: %d,%d",__FUNCTION__,ev->direction,i);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gboolean speed_scroll_event( GtkWidget *widget, GdkEventScroll *ev, gpointer user_data)
|
||||
{
|
||||
gint i = GPOINTER_TO_INT(user_data);
|
||||
int plainspeed = info->status_tokens[SAMPLE_SPEED];
|
||||
|
||||
if(ev->direction == GDK_SCROLL_UP ) {
|
||||
plainspeed = plainspeed + 1;
|
||||
} else if (ev->direction == GDK_SCROLL_DOWN ) {
|
||||
plainspeed = plainspeed - 1;
|
||||
}
|
||||
update_slider_value( "speed_slider", plainspeed, 0 );
|
||||
|
||||
veejay_msg(0, "%s: %d,%d",__FUNCTION__,ev->direction,i);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num, int use_threads)
|
||||
{
|
||||
@@ -6330,15 +6391,25 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
|
||||
NULL );
|
||||
|
||||
GtkWidget *box = glade_xml_get_widget_( info->main_window, "sample_bank_hbox" );
|
||||
info->sample_bank_pad = gtk_notebook_new();
|
||||
gtk_notebook_set_tab_pos( GTK_NOTEBOOK(info->sample_bank_pad), GTK_POS_BOTTOM );
|
||||
gtk_notebook_set_show_tabs( GTK_NOTEBOOK( info->sample_bank_pad ), FALSE );
|
||||
gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET(info->sample_bank_pad), TRUE, TRUE, 0);
|
||||
setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW );
|
||||
info->sample_bank_pad = new_bank_pad( box,0 );
|
||||
|
||||
//QuickSelect slots
|
||||
create_ref_slots( 10 );
|
||||
|
||||
|
||||
//SEQ
|
||||
create_sequencer_slots( 10 );
|
||||
|
||||
char slider_name[16];
|
||||
for( i = 0 ; i < 8 ; i ++ ) {
|
||||
sprintf(slider_name, "slider_p%d",i);
|
||||
GtkWidget *slider = glade_xml_get_widget( info->main_window, slider_name );
|
||||
g_signal_connect( GTK_OBJECT(slider), "scroll-event", G_CALLBACK(slider_scroll_event), (gpointer) i );
|
||||
}
|
||||
|
||||
g_signal_connect( GTK_OBJECT( glade_xml_get_widget(info->main_window, "speed_slider") ), "scroll-event",
|
||||
G_CALLBACK(speed_scroll_event), NULL );
|
||||
|
||||
veejay_memset( vj_event_list, 0, sizeof( vj_event_list ));
|
||||
veejay_memset( vims_keys_list, 0, sizeof( vims_keys_list) );
|
||||
|
||||
@@ -6515,8 +6586,6 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num)
|
||||
}
|
||||
}
|
||||
|
||||
// gveejay_status_lock( info );
|
||||
|
||||
if(!vj_client_connect( info->client, hostname, group_name, port_num ) )
|
||||
{
|
||||
if(info->client)
|
||||
@@ -6574,7 +6643,6 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num)
|
||||
info->uc.reload_hint[HINT_SEQ_ACT] = 1;
|
||||
info->uc.reload_hint[HINT_HISTORY] = 1;
|
||||
|
||||
// gveejay_status_unlock( info );
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -6611,12 +6679,12 @@ void reloaded_schedule_restart()
|
||||
|
||||
void reloaded_restart()
|
||||
{
|
||||
#ifdef STRICT_CHECKING
|
||||
assert( info->watch.state == STATE_STOPPED );
|
||||
#endif
|
||||
GtkWidget *cd = glade_xml_get_widget_(info->main_window, "veejay_connection" );
|
||||
GtkWidget *mw = glade_xml_get_widget_(info->main_window,"gveejay_window" );
|
||||
|
||||
#ifdef STRICT_CHECKING
|
||||
assert( cd != NULL );
|
||||
assert( mw != NULL );
|
||||
#endif
|
||||
// disable and hide mainwindow
|
||||
if(info->sensitive)
|
||||
vj_gui_disable();
|
||||
@@ -6661,6 +6729,10 @@ gboolean is_alive( int *do_sync )
|
||||
{
|
||||
if(info->client)
|
||||
vj_gui_disconnect();
|
||||
// reloaded_schedule_restart();
|
||||
reloaded_restart();
|
||||
*do_sync = 0;
|
||||
return TRUE;
|
||||
// return FALSE;
|
||||
}
|
||||
|
||||
@@ -6688,10 +6760,6 @@ gboolean is_alive( int *do_sync )
|
||||
info->key_id = gtk_key_snooper_install( key_handler , NULL);
|
||||
multrack_audoadd( info->mt, remote, port );
|
||||
*do_sync = 1;
|
||||
// if(user_preview==0)
|
||||
// multitrack_set_quality( info->mt, 2 );
|
||||
// else
|
||||
// {
|
||||
if( user_preview ) {
|
||||
info->preview_locked = 1;
|
||||
multitrack_set_quality( info->mt, user_preview );
|
||||
@@ -6837,10 +6905,11 @@ static int add_bank( gint bank_num )
|
||||
gchar str_label[5];
|
||||
gchar frame_label[20];
|
||||
sprintf(str_label, "%d", bank_num );
|
||||
sprintf(frame_label, "Samples %d to %d",
|
||||
sprintf(frame_label, "Slots %d to %d",
|
||||
(bank_num * NUM_SAMPLES_PER_PAGE), (bank_num * NUM_SAMPLES_PER_PAGE) + NUM_SAMPLES_PER_PAGE );
|
||||
|
||||
setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW );
|
||||
setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW, info->sample_bank_pad, &(info->image_dimensions[0]),
|
||||
&(info->image_dimensions[1]) );
|
||||
|
||||
info->sample_banks[bank_num] = (sample_bank_t*) vj_calloc(sizeof(sample_bank_t));
|
||||
info->sample_banks[bank_num]->bank_number = bank_num;
|
||||
@@ -6852,7 +6921,7 @@ static int add_bank( gint bank_num )
|
||||
{
|
||||
slot[j] = (sample_slot_t*) vj_calloc(sizeof(sample_slot_t) );
|
||||
gui_slot[j] = (sample_gui_slot_t*) vj_calloc(sizeof(sample_gui_slot_t));
|
||||
slot[j]->rawdata = (guchar*) vj_calloc(sizeof(guchar) * 3 * 128 * 128 );
|
||||
// slot[j]->rawdata = (guchar*) vj_calloc(sizeof(guchar) * 3 * 128 * 128 );
|
||||
slot[j]->slot_number = j;
|
||||
slot[j]->sample_id = -1;
|
||||
slot[j]->sample_type = -1;
|
||||
@@ -6958,7 +7027,7 @@ void free_samplebank(void)
|
||||
if(slot->title) free(slot->title);
|
||||
if(slot->timecode) free(slot->timecode);
|
||||
if(slot->pixbuf) gdk_pixbuf_unref(slot->pixbuf);
|
||||
if(slot->rawdata) free(slot->rawdata);
|
||||
// if(slot->rawdata) free(slot->rawdata);
|
||||
free(slot);
|
||||
free(gslot);
|
||||
info->sample_banks[i]->slot[j] = NULL;
|
||||
@@ -6973,13 +7042,19 @@ void free_samplebank(void)
|
||||
}
|
||||
#define RUP8(num)(((num)+8)&~8)
|
||||
|
||||
void setup_samplebank(gint num_cols, gint num_rows)
|
||||
|
||||
//@ OK
|
||||
void setup_samplebank(gint num_cols, gint num_rows, GtkWidget *pad, int *idx, int *idy)
|
||||
{
|
||||
GdkRectangle result;
|
||||
if(info->el.width > 0 && info->el.height > 0 )
|
||||
{
|
||||
if(info->el.width <= 0 || info->el.height <= 0 ) {
|
||||
*idx = 0;
|
||||
*idy = 0;
|
||||
return;
|
||||
}
|
||||
else {
|
||||
widget_get_rect_in_screen(
|
||||
info->sample_bank_pad,
|
||||
pad,
|
||||
&result
|
||||
);
|
||||
result.width -= ( num_rows * 16);
|
||||
@@ -6988,15 +7063,13 @@ void setup_samplebank(gint num_cols, gint num_rows)
|
||||
gint image_height = result.height / num_cols;
|
||||
float ratio = (float) info->el.height / (float) info->el.width;
|
||||
image_height = image_width * ratio;
|
||||
info->image_dimensions[0] = 64;
|
||||
info->image_dimensions[1] = 64 * ratio;
|
||||
*idx = 64;
|
||||
*idy = 64 * ratio;
|
||||
// info->image_dimensions[0] = 64;
|
||||
// info->image_dimensions[1] = 64 * ratio;
|
||||
veejay_msg(0, "Image: %dx%d", image_width,image_height );
|
||||
}
|
||||
else
|
||||
{
|
||||
info->image_dimensions[0] = 0 ;
|
||||
info->image_dimensions[1] = 0;
|
||||
}
|
||||
veejay_msg(VEEJAY_MSG_INFO, "Sample bank image dimensions: %dx%d", info->image_dimensions[0],info->image_dimensions[1]);
|
||||
veejay_msg(VEEJAY_MSG_INFO, "Sample bank image dimensions: %dx%d", *idx,*idy);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -7291,18 +7364,12 @@ static void create_slot(gint bank_nr, gint slot_nr, gint w, gint h)
|
||||
gui_slot->event_box = gtk_event_box_new();
|
||||
gtk_event_box_set_visible_window(GTK_EVENT_BOX(gui_slot->event_box), TRUE);
|
||||
|
||||
|
||||
GTK_WIDGET_SET_FLAGS(gui_slot->event_box,GTK_CAN_FOCUS);
|
||||
g_signal_connect( G_OBJECT(gui_slot->event_box),
|
||||
"button_press_event",
|
||||
G_CALLBACK(on_slot_activated_by_mouse),
|
||||
(gpointer)slot_nr
|
||||
);
|
||||
g_signal_connect( G_OBJECT(gui_slot->event_box),
|
||||
"key_press_event",
|
||||
G_CALLBACK(on_slot_activated_by_key),
|
||||
(gpointer)slot_nr
|
||||
);
|
||||
gtk_widget_show(GTK_WIDGET(gui_slot->event_box));
|
||||
/* the surrounding frame for each slot */
|
||||
gui_slot->frame = gtk_frame_new(NULL);
|
||||
@@ -7376,11 +7443,9 @@ static gboolean on_slot_activated_by_mouse (GtkWidget *widget, GdkEventButton *e
|
||||
if(bank_nr < 0 )
|
||||
return FALSE;
|
||||
|
||||
// slot_nr = (gint *)user_data;
|
||||
slot_nr = GPOINTER_TO_INT(user_data);
|
||||
sample_bank_t **sample_banks = info->sample_banks;
|
||||
|
||||
/* Dont select slot if nothing is there */
|
||||
if( info->sample_banks[ bank_nr ]->slot[ slot_nr ]->sample_id <= 0 )
|
||||
return FALSE;
|
||||
|
||||
@@ -7392,26 +7457,42 @@ static gboolean on_slot_activated_by_mouse (GtkWidget *widget, GdkEventButton *e
|
||||
}
|
||||
else if(event->type == GDK_BUTTON_PRESS )
|
||||
{
|
||||
if( (event->state & GDK_SHIFT_MASK ) == GDK_SHIFT_MASK ) {
|
||||
sample_slot_t *x = sample_banks[bank_nr]->slot[slot_nr];
|
||||
multi_vims( VIMS_CHAIN_ENTRY_SET_SOURCE_CHANNEL,
|
||||
"%d %d %d %d",
|
||||
0,
|
||||
info->uc.selected_chain_entry,
|
||||
x->sample_type,
|
||||
x->sample_id );
|
||||
|
||||
if(x->sample_id == 1 ) {
|
||||
vj_msg(VEEJAY_MSG_INFO, "Set mixing channel %d to Stream %d", info->uc.selected_chain_entry,
|
||||
x->sample_id );
|
||||
} else {
|
||||
vj_msg(VEEJAY_MSG_INFO, "Set mixing channel %d to Sample %d", info->uc.selected_chain_entry,
|
||||
x->sample_id);
|
||||
}
|
||||
|
||||
char trip[100];
|
||||
snprintf(trip, sizeof(trip), "%03d:%d %d %d %d",VIMS_CHAIN_ENTRY_SET_SOURCE_CHANNEL,
|
||||
0,
|
||||
info->uc.selected_chain_entry,
|
||||
x->sample_type,
|
||||
x->sample_id );
|
||||
|
||||
vj_midi_learning_vims( info->midi, NULL, trip, 0 );
|
||||
} else {
|
||||
if(info->selection_slot)
|
||||
set_selection_of_slot_in_samplebank(FALSE);
|
||||
info->selection_slot = sample_banks[bank_nr]->slot[slot_nr];
|
||||
info->selection_gui_slot = sample_banks[bank_nr]->gui_slot[slot_nr];
|
||||
set_selection_of_slot_in_samplebank(TRUE );
|
||||
|
||||
}
|
||||
// redraw bank page?
|
||||
}
|
||||
return FALSE;
|
||||
|
||||
}
|
||||
/* --------------------------------------------------------------------------------------------------------------------------
|
||||
* Handler of key presses on the GUI-elements of one slot
|
||||
-------------------------------------------------------------------------------------------------------------------------- */
|
||||
static gboolean on_slot_activated_by_key (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
|
||||
{
|
||||
// test
|
||||
printf("%s\n","press");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
static void indicate_sequence( gboolean active, sequence_gui_slot_t *slot )
|
||||
|
||||
@@ -127,6 +127,8 @@ static gboolean event_release (GtkWidget *widget, GdkEventButton *bev, gpointer
|
||||
|
||||
static gboolean event_motion (GtkWidget *widget, GdkEventMotion *mev, gpointer user_data);
|
||||
|
||||
static gboolean event_scroll (GtkWidget *widget, GdkEventScroll *mev, gpointer user_data);
|
||||
|
||||
static void timeline_class_init( TimelineSelectionClass *class );
|
||||
|
||||
static void timeline_init(TimelineSelection *te );
|
||||
@@ -527,6 +529,30 @@ static void move_selection( GtkWidget *widget, gdouble x, gdouble width )
|
||||
|
||||
}
|
||||
|
||||
static gboolean
|
||||
event_scroll (GtkWidget *widget, GdkEventScroll *ev, gpointer user_data)
|
||||
{
|
||||
TimelineSelection *te = TIMELINE_SELECTION (widget);
|
||||
gdouble width = (gdouble) widget->allocation.width;
|
||||
gint x,y;
|
||||
GdkModifierType state;
|
||||
gdk_window_get_pointer( ev->window, &x,&y,&state );
|
||||
|
||||
if( ev->direction == GDK_SCROLL_UP ) {
|
||||
gdouble cur_pos = timeline_get_pos(widget);
|
||||
timeline_set_pos( widget, cur_pos + 1 );
|
||||
}
|
||||
else if(ev->direction == GDK_SCROLL_DOWN ) {
|
||||
gdouble cur_pos = timeline_get_pos(widget);
|
||||
timeline_set_pos( widget, cur_pos - 1 );
|
||||
}
|
||||
|
||||
gtk_widget_queue_draw( widget );
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
static gboolean event_press(GtkWidget *widget, GdkEventButton *ev, gpointer user_data)
|
||||
{
|
||||
TimelineSelection *te = TIMELINE_SELECTION( widget );
|
||||
@@ -535,6 +561,7 @@ static gboolean event_press(GtkWidget *widget, GdkEventButton *ev, gpointer user
|
||||
te->grab_button = ev->button;
|
||||
te->current_location = MOUSE_WIDGET;
|
||||
|
||||
|
||||
if( ev->type == GDK_2BUTTON_PRESS && te->grab_button == 1 )
|
||||
{
|
||||
timeline_clear_points( widget );
|
||||
@@ -827,7 +854,7 @@ GtkWidget *timeline_new(void)
|
||||
GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK |
|
||||
GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK |
|
||||
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
|
||||
GDK_BUTTON3_MOTION_MASK | GDK_2BUTTON_PRESS );
|
||||
GDK_BUTTON3_MOTION_MASK | GDK_2BUTTON_PRESS | GDK_SCROLL_MASK );
|
||||
|
||||
g_signal_connect( G_OBJECT(widget), "expose_event", G_CALLBACK(timeline_expose), NULL );
|
||||
g_signal_connect( G_OBJECT(widget), "motion_notify_event",
|
||||
@@ -836,6 +863,8 @@ GtkWidget *timeline_new(void)
|
||||
G_CALLBACK(event_press), NULL );
|
||||
g_signal_connect( G_OBJECT(widget), "button_release_event",
|
||||
G_CALLBACK(event_release), NULL );
|
||||
g_signal_connect( G_OBJECT(widget), "scroll_event",
|
||||
G_CALLBACK( event_scroll ), NULL );
|
||||
|
||||
te->widget = widget;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user