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

[Summary] Progressing TRACKS specific Import Dialog

Browse source
This commit is contained in:
VKamyshniy 2015-01-31 21:42:09 +02:00
parent ccbb167ad3
commit e40f4ac450
3 changed files with 21 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/editor_audio_import.cc
View file

@ -95,8 +95,11 @@ Editor::add_external_audio_action (ImportMode mode_hint)
void
Editor::external_audio_dialog ()
{
WavesImportDialog import_dialog;
import_dialog.run ();
WavesImportDialog import_dialog (_session);
int result = import_dialog.run_import ();
std::cout << "***************** import_dialog.run () returned with " << result << std::endl;
vector<string> paths;
uint32_t audio_track_cnt;
uint32_t midi_track_cnt;

65
gtk2_ardour/ui/waves_import_dialog.xml
View file

@ -24,68 +24,16 @@
fgnormal="#C1C1C1"
textcolornormal="#C1C1C1"
bgnormal="#6C6C6C"
normalicon="dropdown_90x20"
activeicon="dropdown_90x20_active"
inactiveicon="dropdown_90x20_inactive"
width="90"
normalicon="dropdown_126x20"
activeicon="dropdown_126x20_active"
inactiveicon="dropdown_126x20_inactive"
width="126"
height="20"
horzalignment="start"/>
<style name="generic_dropdown_menu"
style="generic_dropdown"
height="-1"
width="-1"/>
<style name="topbar_dropdown"
bgnormal="#10474b"
fgdisabled="#335b63"
fgnormal="#ffffff"
fgactive="#ffffff"
fghover="#ffffff"
winfont ="Arial 10"
macfont ="Helvetica 10"
width="63"
height="18"/>
<style name="topbar_dropdown_menu"
bgnormal="#43919A"
fgnormal="#ffffff"
fgactive="#ffffff"
fghover="#ffffff"
winfont ="Arial Bold 9"
macfont ="Helvetica 10"/>
<HBox spacing="10" borderwidth="10">
<Dropdown id="display_format_dropdown"
style="topbar_dropdown"
x="200"
y="28"
normalicon="topbar_button"
activeicon="topbar_button_active"
inactiveicon="topbar_button">
<Label style="topbar_dropdown_menu" text="The Drop Down" state="disabled"
baseinactive="#ff0000" usemarkup="true"/>
<DropdownMenu style="topbar_dropdown_menu">
<DropdownItem style="topbar_dropdown_menu"
title="Skip Ruler"
horzalignment="start"/>
<DropdownItem style="topbar_dropdown_menu"
title="Skip Ruler Again"
horzalignment="start"
state="disabled"/>
</DropdownMenu>
</Dropdown>
<Dropdown id="display_format_dropdown"
style="topbar_dropdown"
x="200"
y="28"
normalicon="topbar_button"
activeicon="topbar_button_active"
inactiveicon="topbar_button">
<Label style="topbar_dropdown_menu" text="The Drop Down"/>
<DropdownMenu style="topbar_dropdown_menu">
<DropdownItem style="topbar_dropdown_menu"
title="Skip Ruler"
horzalignment="start"/>
</DropdownMenu>
</Dropdown>
</HBox>
<EventBox bgnormal="#EDECE8">
<VBox borderwidth="10"
spacing="10">
@ -128,6 +76,7 @@
text="Mapping"/>
<Dropdown id="mapping_dropdown"
style="generic_dropdown">
<!--Former channel_combo-->
<HBox>
<VBox width="5"/>
<Label style="generic_dropdown_menu"/>
@ -157,11 +106,13 @@
</DropdownMenu>
</Dropdown>
</HBox>
<HBox spacing="5">
<HBox id="copy_to_session_home"
spacing="5">
<Label style="generic_label"
text="Copy files to session"/>
<HBox style="generic_dropdown">
<Iconbutton id="copy_to_session_button"
state="active"
width="20"
height="20"
normalicon="waves_darker_check_box"

9
gtk2_ardour/waves_import_dialog.h
View file

@ -38,7 +38,12 @@
class WavesImportDialog : public WavesDialog
{
public:
WavesImportDialog ();
WavesImportDialog (ARDOUR::Session*);
int run_import ();
protected:
bool check_link_status ();
bool check_info (bool&, bool&, bool&);
private:
enum Impord {
@ -71,11 +76,13 @@ private:
int _status;
bool _done;
std::vector<std::string> _files_to_import;
WavesDropdown& _add_as_dropdown;
WavesDropdown& _insert_at_dropdown;
WavesDropdown& _mapping_dropdown;
WavesDropdown& _quality_dropdown;
Gtk::Container& _copy_to_session_home;
WavesButton& _copy_to_session_button;
};