smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 23:17:46 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Making WavesDropdown::get_item_associated_data WavesDropdown::get_item_data_pv. Adding little order in using the WavesDropdown::get_item_data_*.

Browse source
This commit is contained in:
VKamyshniy 2015-01-30 01:59:35 +02:00
parent a019dc755c
commit c462c65dc1
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui_ed.cc
View file

@ -266,7 +266,7 @@ ARDOUR_UI::sync_displays_format (AudioClock::Mode mode)
void
ARDOUR_UI::on_display_format_dropdown_item_clicked (WavesDropdown* dropdown, int el_number)
{
void* data = dropdown->get_item_associated_data(el_number);
void* data = dropdown->get_item_data_pv(el_number);
assert(data);
string format = *(string*)data;
@ -286,7 +286,7 @@ ARDOUR_UI::on_display_format_dropdown_item_clicked (WavesDropdown* dropdown, int
void
ARDOUR_UI::on_timecode_source_dropdown_item_clicked (WavesDropdown* dropdown, int el_number)
{
void* data = dropdown->get_item_associated_data(el_number);
void* data = dropdown->get_item_data_pv(el_number);
assert(data);
string timecode_source = *(string*)data;
@ -408,7 +408,7 @@ ARDOUR_UI::sample_rate_changed()
void
ARDOUR_UI::on_sample_rate_dropdown_item_clicked (WavesDropdown* dropdown, int el_number)
{
void* data = dropdown->get_item_associated_data(el_number);
void* data = dropdown->get_item_data_pv(el_number);
assert(data);
framecnt_t sample_rate = *(float*)data;

4
gtk2_ardour/editor_markers.cc
View file

@ -1372,7 +1372,7 @@ Editor::reset_marker_midi_images (bool input)
void
Editor::midi_input_chosen (WavesDropdown* dropdown, int el_number)
{
char* full_name_of_chosen_port = (char*)dropdown->get_item_associated_data(el_number);
char* full_name_of_chosen_port = (char*)dropdown->get_item_data_pv(el_number);
if (full_name_of_chosen_port) {
Gtk::MenuItem* item = dropdown->get_item(el_number);
@ -1388,7 +1388,7 @@ Editor::midi_input_chosen (WavesDropdown* dropdown, int el_number)
void
Editor::midi_output_chosen (WavesDropdown* dropdown, int el_number)
{
char* full_name_of_chosen_port = (char*)dropdown->get_item_associated_data(el_number);
char* full_name_of_chosen_port = (char*)dropdown->get_item_data_pv(el_number);
if (full_name_of_chosen_port) {
Gtk::MenuItem* item = dropdown->get_item(el_number);

4
gtk2_ardour/tracks_control_panel.logic.cc
View file

@ -1209,7 +1209,7 @@ TracksControlPanel::save_general_preferences ()
int cur_item_num = _hard_disk_buffering_dropdown.get_current_item ();
BufferingPreset preset;
preset = BufferingPreset((char*)_hard_disk_buffering_dropdown.get_item_associated_data (cur_item_num) - (char*)0);
preset = BufferingPreset(_hard_disk_buffering_dropdown.get_item_data_u (cur_item_num));
Config->set_buffering_preset (preset);
}
@ -1414,7 +1414,7 @@ TracksControlPanel::on_sample_rate_dropdown_item_clicked (WavesDropdown*, int)
void
TracksControlPanel::on_mtc_input_chosen (WavesDropdown* dropdown, int el_number)
{
char* full_name_of_chosen_port = (char*)dropdown->get_item_associated_data(el_number);
char* full_name_of_chosen_port = (char*)dropdown->get_item_data_pv(el_number);
if (full_name_of_chosen_port) {
EngineStateController::instance()->set_mtc_input((char*) full_name_of_chosen_port);

4
gtk2_ardour/waves_dropdown.cc
View file

@ -41,11 +41,11 @@ WavesDropdown::clear_items ()
}
void*
WavesDropdown::get_item_associated_data(int item_number)
WavesDropdown::get_item_data_pv(size_t item_number)
{
Gtk::Menu_Helpers::MenuList& items = _menu.items ();
if (item_number >= items.size()) {
return NULL;
return 0;
}
Gtk::Menu_Helpers::MenuList::iterator i = items.begin();

6
gtk2_ardour/waves_dropdown.h
View file

@ -36,9 +36,9 @@ class WavesDropdown : public WavesIconButton
int get_current_item () { return _current_item_number; }
void set_current_item (int current_item_number);
void* get_item_associated_data (size_t);
int get_item_data_i (size_t item) { return (char*)get_item_associated_data(item) - (char*)0; }
unsigned int get_item_data_u (size_t item) { return (char*)get_item_associated_data(item) - (char*)0; }
void* get_item_data_pv (size_t);
int get_item_data_i (size_t item) { return (char*)get_item_data_pv(item) - (char*)0; }
unsigned int get_item_data_u (size_t item) { return (char*)get_item_data_pv(item) - (char*)0; }
Gtk::MenuItem* get_item (int);
Gtk::MenuItem* get_item (const std::string&);

4
gtk2_ardour/waves_export_filename_selector.cc
View file

@ -86,7 +86,7 @@ WavesExportFilenameSelector::load_state ()
int size = _date_format_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_date_format_dropdown.get_item_associated_data (i) == (void*)filename->get_date_format()) {
if (_date_format_dropdown.get_item_data_u (i) == filename->get_date_format()) {
_date_format_dropdown.set_current_item (i);
break;
}
@ -94,7 +94,7 @@ WavesExportFilenameSelector::load_state ()
size = _time_format_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_time_format_dropdown.get_item_associated_data (i) == (void*)filename->get_time_format()) {
if (_time_format_dropdown.get_item_data_u (i) == filename->get_time_format()) {
_time_format_dropdown.set_current_item (i);
break;
}

8
gtk2_ardour/waves_export_format_selector.cc
View file

@ -87,7 +87,7 @@ WavesExportFormatSelector::update_selector_format ()
}
int size = _format_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_format_dropdown.get_item_associated_data (i) == (void*)export_format_id) {
if (_format_dropdown.get_item_data_u (i) == export_format_id) {
_format_dropdown.set_current_item (i);
break;
}
@ -111,7 +111,7 @@ WavesExportFormatSelector::update_selector_depth ()
}
int size = _depth_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_depth_dropdown.get_item_associated_data (i) == (void*)depth) {
if (_depth_dropdown.get_item_data_u (i) == depth) {
_depth_dropdown.set_current_item (i);
break;
}
@ -147,7 +147,7 @@ WavesExportFormatSelector::update_selector_sample_rate ()
}
int size = _sample_rate_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_sample_rate_dropdown.get_item_associated_data (i) == (void*)sample_rate) {
if (_sample_rate_dropdown.get_item_data_u (i) == sample_rate) {
_sample_rate_dropdown.set_current_item (i);
break;
}
@ -177,7 +177,7 @@ WavesExportFormatSelector::update_selector_dithering ()
}
int size = _dithering_dropdown.get_menu ().items ().size ();
for (int i = 0; i < size; i++) {
if (_dithering_dropdown.get_item_associated_data (i) == (void*)export_dithering_id) {
if (_dithering_dropdown.get_item_data_u (i) == export_dithering_id) {
_dithering_dropdown.set_current_item (i);
break;
}

2
gtk2_ardour/waves_export_timespan_selector.cc
View file

@ -126,7 +126,7 @@ WavesExportTimespanSelector::set_time_format_from_state ()
unsigned int size = _time_format_dropdown.get_menu ().items ().size();
for (unsigned int i = 0; i < size; i++) {
if (_time_format_dropdown.get_item_associated_data (i) == (void*)itemdata) {
if (_time_format_dropdown.get_item_data_u (i) == itemdata) {
_time_format_dropdown.set_current_item (i);
break;
}