From db94a299a58d67bb1a6eb718fe4ad9bdc1f8a65f Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 11 May 2023 09:35:17 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA=20=D0=B2?= =?UTF-8?q?=20csv=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grub-play.csv | 1 + source/ubl-settings-bootloader.cc | 4 ++-- source/ubl-settings-bootloader.h | 2 +- source/util.cc | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/grub-play.csv b/grub-play.csv index b4167ab..1c42eb8 100644 --- a/grub-play.csv +++ b/grub-play.csv @@ -1 +1,2 @@ +Option;Tone code ubbeep;1 22 333 4444 5555 \ No newline at end of file diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index a7cd686..b776f7b 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -717,7 +717,7 @@ void MainWindow::set_init_data_superuser(std::map &map_temp) { void MainWindow::set_data_csv_melody() { string path_name = ""; - path_name = path_name + path_resources + "/" + path_melody; + path_name = path_name + path_resources + "/" + melody_csv; string line; string all_melody = ""; string all_melody_old = ""; @@ -765,7 +765,7 @@ void MainWindow::set_init_data_melody(std::map &map_temp) { list_store_melody = Gtk::ListStore::create(m_columns_melody); treeViewMelody->set_model(list_store_melody); string path_name = ""; - path_name = path_name + path_resources + "/" + path_melody; + path_name = path_name + path_resources + "/" + melody_csv; vector> vec_melody = Utils::read_csv_melody(path_name); bool flag = false; string cgf_code_melody = map_temp["GRUB_PLAY"]; diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index f65e43b..36ece7a 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -132,7 +132,7 @@ void me_thread(string cmd); #define icon_checked "com.ublinux.ubl-settings-bootloader.checked" #define icon_warning "com.ublinux.ubl-settings-bootloader.warning" #define kernel_csv "grub-cmdline-linux.csv" -#define path_melody "grub-play.csv" +#define melody_csv "grub-play.csv" #define IPT_csv "grub-terminal-input.csv" #define OTT_csv "grub-terminal-output.csv" #define path_app "/usr/bin/" diff --git a/source/util.cc b/source/util.cc index 943146d..61c7688 100644 --- a/source/util.cc +++ b/source/util.cc @@ -63,6 +63,7 @@ vector> read_csv_melody(const string& filename) { ifstream file(filename); string line; char delimiter = ';'; + getline(file, line); while (getline(file, line)) { stringstream stream(line); string name;