gentoo/boudigi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'global'

Browse Source 
Conflicts:
	.gitignore
	effects.c
	gdigi.c
	gdigi.h
	gdigi_xml.h
	gui.c
	gui.h
	preset.c
	preset_xml.c

effects.c: More effect_values_0_to_* arrays for various effects.
           VALUE_TYPE_POSID for linkable effects.
           Add the rest of the global settings (need to change USB_POSITION
           to GLOBAL_POSITION throughout).
           A few label typos.
           New settings, groups, and effects for linkables.
           Make the display three rows instead of two.
           Add missing modifiers.
           Add missing xml settings.
           Code for handling/updating the global modifier linkable list.

effects.h Add VALUE_TYPE_POSID.

gdigi.c   Tweaks for value formatting.
          Use NOTIFY_MODIFIER_GROUP_CHANGED to drive the update of the combo
          boxes for linkable effects.
          Use RECEIVE_MODIFIER_LINKABLE_LIST to handle the update of the
          combo boxes for linkable effects.

gdigi.h   Minor changes.

gui.c     Deprecate gtk_vbox_new().
          Use simpler API gtk_combo_box_text_append_text().
          Minor reformatting/whitespace changes.
          Code to update combo boxes for linkable effects.
          Code to retrieve global parameters from device at startup.

preset_xml.c
          Some tweaks to map_xml_value() so that it's passed resolved
          EffectValues for settings of type EXTRA.
This commit is contained in:
Tim LaBerge
2012-12-16 21:30:41 -08:00
parent 29d33ce93a 44dbbe7b72
commit a389c785f7
8 changed files with 397 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
effects.h
View File

@@ -27,7 +27,8 @@ typedef enum {
VALUE_TYPE_LABEL = 1 << 3, /**< use value labels (overrides any other option) */
VALUE_TYPE_EXTRA = 1 << 4, /**< use extra values */
VALUE_TYPE_DECIMAL= 1 << 5, /**< display decimal places */
VALUE_TYPE_NONE = 1 << 6, /**< no value displayed */
VALUE_TYPE_POSID = 1 << 6, /**< Packed Position/ID: (pos << 16) | id */
VALUE_TYPE_NONE = 1 << 7, /**< no value displayed */
} ValueType;
typedef struct _EffectValues {
@@ -118,6 +119,7 @@ typedef struct {
gchar *get_position(guint position);
ModifierGroup *modifier_linkable_list();
extern ModifierGroup *ModifierLinkableList;
void modifier_group_free(ModifierGroup *modifier_group);
void get_values_info(EffectValues *values,
gdouble *min, gdouble *max, gboolean *custom);
@@ -125,4 +127,5 @@ gboolean get_device_info(unsigned char device_id, unsigned char family_id,
unsigned char product_id,
Device **device);
#endif /* GDIGI_EFFECTS_H */