diff options
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/actions.cpp | 1 | ||||
| -rw-r--r-- | src/browser.cpp | 1 | ||||
| -rw-r--r-- | src/media_library.cpp | 1 | ||||
| -rw-r--r-- | src/menu.h | 319 | ||||
| -rw-r--r-- | src/menu_impl.h | 349 | ||||
| -rw-r--r-- | src/outputs.cpp | 1 | ||||
| -rw-r--r-- | src/playlist.cpp | 2 | ||||
| -rw-r--r-- | src/playlist_editor.cpp | 1 | ||||
| -rw-r--r-- | src/search_engine.cpp | 1 | ||||
| -rw-r--r-- | src/sel_items_adder.cpp | 1 | ||||
| -rw-r--r-- | src/sort_playlist.cpp | 1 | ||||
| -rw-r--r-- | src/status.cpp | 1 | ||||
| -rw-r--r-- | src/tag_editor.cpp | 1 | ||||
| -rw-r--r-- | src/tiny_tag_editor.cpp | 1 |
15 files changed, 362 insertions, 320 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index aa945017..8a298192 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,6 +85,7 @@ noinst_HEADERS = \ macro_utilities.h \ media_library.h \ menu.h \ + menu_impl.h \ mpdpp.h \ mutable_song.h \ outputs.h \ diff --git a/src/actions.cpp b/src/actions.cpp index 4e171322..5c666419 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -45,6 +45,7 @@ #include "clock.h" #include "help.h" #include "media_library.h" +#include "menu_impl.h" #include "lastfm.h" #include "lyrics.h" #include "playlist.h" diff --git a/src/browser.cpp b/src/browser.cpp index 50ea3bae..0f26862c 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -32,6 +32,7 @@ #include "global.h" #include "helpers.h" #include "playlist.h" +#include "menu_impl.h" #include "screen_switcher.h" #include "settings.h" #include "status.h" diff --git a/src/media_library.cpp b/src/media_library.cpp index fe402402..cc5a5e75 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -29,6 +29,7 @@ #include "display.h" #include "helpers.h" #include "global.h" +#include "menu_impl.h" #include "mpdpp.h" #include "playlist.h" #include "media_library.h" @@ -315,325 +315,6 @@ private: Buffer m_selected_suffix; }; -template <typename ItemT> -Menu<ItemT>::Menu(size_t startx, - size_t starty, - size_t width, - size_t height, - const std::string &title, - Color color, - Border border) - : Window(startx, starty, width, height, title, std::move(color), border), - m_item_displayer(0), - m_beginning(0), - m_highlight(0), - m_highlight_color(m_base_color), - m_highlight_enabled(true), - m_cyclic_scroll_enabled(false), - m_autocenter_cursor(false) -{ -} - -template <typename ItemT> -Menu<ItemT>::Menu(const Menu &rhs) -: Window(rhs) -, m_item_displayer(rhs.m_item_displayer) -, m_beginning(rhs.m_beginning) -, m_highlight(rhs.m_highlight) -, m_highlight_color(rhs.m_highlight_color) -, m_highlight_enabled(rhs.m_highlight_enabled) -, m_cyclic_scroll_enabled(rhs.m_cyclic_scroll_enabled) -, m_autocenter_cursor(rhs.m_autocenter_cursor) -, m_drawn_position(rhs.m_drawn_position) -, m_selected_prefix(rhs.m_selected_prefix) -, m_selected_suffix(rhs.m_selected_suffix) -{ - // there is no way to properly fill m_filtered_options - // (if rhs is filtered), so we just don't do it. - m_items.reserve(rhs.m_items.size()); - std::copy(rhs.begin(), rhs.end(), std::back_inserter(m_items)); -} - -template <typename ItemT> -Menu<ItemT>::Menu(Menu &&rhs) -: Window(rhs) -, m_item_displayer(rhs.m_item_displayer) -, m_items(std::move(rhs.m_items)) -, m_beginning(rhs.m_beginning) -, m_highlight(rhs.m_highlight) -, m_highlight_color(rhs.m_highlight_color) -, m_highlight_enabled(rhs.m_highlight_enabled) -, m_cyclic_scroll_enabled(rhs.m_cyclic_scroll_enabled) -, m_autocenter_cursor(rhs.m_autocenter_cursor) -, m_drawn_position(rhs.m_drawn_position) -, m_selected_prefix(std::move(rhs.m_selected_prefix)) -, m_selected_suffix(std::move(rhs.m_selected_suffix)) -{ -} - -template <typename ItemT> -Menu<ItemT> &Menu<ItemT>::operator=(Menu rhs) -{ - std::swap(static_cast<Window &>(*this), static_cast<Window &>(rhs)); - std::swap(m_item_displayer, rhs.m_item_displayer); - std::swap(m_items, rhs.m_items); - std::swap(m_beginning, rhs.m_beginning); - std::swap(m_highlight, rhs.m_highlight); - std::swap(m_highlight_color, rhs.m_highlight_color); - std::swap(m_highlight_enabled, rhs.m_highlight_enabled); - std::swap(m_cyclic_scroll_enabled, rhs.m_cyclic_scroll_enabled); - std::swap(m_autocenter_cursor, rhs.m_autocenter_cursor); - std::swap(m_drawn_position, rhs.m_drawn_position); - std::swap(m_selected_prefix, rhs.m_selected_prefix); - std::swap(m_selected_suffix, rhs.m_selected_suffix); - return *this; -} - -template <typename ItemT> -void Menu<ItemT>::resizeList(size_t new_size) -{ - if (new_size > m_items.size()) - { - size_t old_size = m_items.size(); - m_items.resize(new_size); - for (size_t i = old_size; i < new_size; ++i) - m_items[i] = Item(); - } - else - m_items.resize(new_size); -} - -template <typename ItemT> -void Menu<ItemT>::addItem(ItemT item, bool is_bold, bool is_inactive) -{ - m_items.push_back(Item(std::move(item), is_bold, is_inactive)); -} - -template <typename ItemT> -void Menu<ItemT>::addSeparator() -{ - m_items.push_back(Item::mkSeparator()); -} - -template <typename ItemT> -void Menu<ItemT>::insertItem(size_t pos, const ItemT &item, bool is_bold, bool is_inactive) -{ - m_items.insert(m_items.begin()+pos, Item(item, is_bold, is_inactive)); -} - -template <typename ItemT> -void Menu<ItemT>::insertSeparator(size_t pos) -{ - m_items.insert(m_items.begin()+pos, Item::mkSeparator()); -} - -template <typename ItemT> -void Menu<ItemT>::deleteItem(size_t pos) -{ - assert(pos < m_items.size()); - m_items.erase(m_items.begin()+pos); -} - -template <typename ItemT> -bool Menu<ItemT>::Goto(size_t y) -{ - if (!isHighlightable(m_beginning+y)) - return false; - m_highlight = m_beginning+y; - return true; -} - -template <typename ItemT> -void Menu<ItemT>::refresh() -{ - if (m_items.empty()) - { - Window::clear(); - Window::refresh(); - return; - } - - size_t max_beginning = 0; - if (m_items.size() > m_height) - max_beginning = m_items.size() - m_height; - m_beginning = std::min(m_beginning, max_beginning); - - // if highlighted position is off the screen, make it visible - m_highlight = std::min(m_highlight, m_beginning+m_height-1); - // if highlighted position is invalid, correct it - m_highlight = std::min(m_highlight, m_items.size()-1); - - if (!isHighlightable(m_highlight)) - { - scroll(Scroll::Up); - if (!isHighlightable(m_highlight)) - scroll(Scroll::Down); - } - - size_t line = 0; - m_drawn_position = m_beginning; - for (size_t &i = m_drawn_position; i < m_beginning+m_height; ++i, ++line) - { - goToXY(0, line); - if (i >= m_items.size()) - { - for (; line < m_height; ++line) - mvwhline(m_window, line, 0, KEY_SPACE, m_width); - break; - } - if (m_items[i]->isSeparator()) - { - mvwhline(m_window, line, 0, 0, m_width); - continue; - } - if (m_items[i]->isBold()) - *this << Format::Bold; - if (m_highlight_enabled && i == m_highlight) - { - *this << Format::Reverse; - *this << m_highlight_color; - } - mvwhline(m_window, line, 0, KEY_SPACE, m_width); - if (m_items[i]->isSelected()) - *this << m_selected_prefix; - if (m_item_displayer) - m_item_displayer(*this); - if (m_items[i]->isSelected()) - *this << m_selected_suffix; - if (m_highlight_enabled && i == m_highlight) - { - *this << Color::End; - *this << Format::NoReverse; - } - if (m_items[i]->isBold()) - *this << Format::NoBold; - } - Window::refresh(); -} - -template <typename ItemT> -void Menu<ItemT>::scroll(Scroll where) -{ - if (m_items.empty()) - return; - size_t max_highlight = m_items.size()-1; - size_t max_beginning = m_items.size() < m_height ? 0 : m_items.size()-m_height; - size_t max_visible_highlight = m_beginning+m_height-1; - switch (where) - { - case Scroll::Up: - { - if (m_highlight <= m_beginning && m_highlight > 0) - --m_beginning; - if (m_highlight == 0) - { - if (m_cyclic_scroll_enabled) - return scroll(Scroll::End); - break; - } - else - --m_highlight; - if (!isHighlightable(m_highlight)) - scroll(m_highlight == 0 && !m_cyclic_scroll_enabled ? Scroll::Down : Scroll::Up); - break; - } - case Scroll::Down: - { - if (m_highlight >= max_visible_highlight && m_highlight < max_highlight) - ++m_beginning; - if (m_highlight == max_highlight) - { - if (m_cyclic_scroll_enabled) - return scroll(Scroll::Home); - break; - } - else - ++m_highlight; - if (!isHighlightable(m_highlight)) - scroll(m_highlight == max_highlight && !m_cyclic_scroll_enabled ? Scroll::Up : Scroll::Down); - break; - } - case Scroll::PageUp: - { - if (m_cyclic_scroll_enabled && m_highlight == 0) - return scroll(Scroll::End); - if (m_highlight < m_height) - m_highlight = 0; - else - m_highlight -= m_height; - if (m_beginning < m_height) - m_beginning = 0; - else - m_beginning -= m_height; - if (!isHighlightable(m_highlight)) - scroll(m_highlight == 0 && !m_cyclic_scroll_enabled ? Scroll::Down : Scroll::Up); - break; - } - case Scroll::PageDown: - { - if (m_cyclic_scroll_enabled && m_highlight == max_highlight) - return scroll(Scroll::Home); - m_highlight += m_height; - m_beginning += m_height; - m_beginning = std::min(m_beginning, max_beginning); - m_highlight = std::min(m_highlight, max_highlight); - if (!isHighlightable(m_highlight)) - scroll(m_highlight == max_highlight && !m_cyclic_scroll_enabled ? Scroll::Up : Scroll::Down); - break; - } - case Scroll::Home: - { - m_highlight = 0; - m_beginning = 0; - if (!isHighlightable(m_highlight)) - scroll(Scroll::Down); - break; - } - case Scroll::End: - { - m_highlight = max_highlight; - m_beginning = max_beginning; - if (!isHighlightable(m_highlight)) - scroll(Scroll::Up); - break; - } - } - if (m_autocenter_cursor) - highlight(m_highlight); -} - -template <typename ItemT> -void Menu<ItemT>::reset() -{ - m_highlight = 0; - m_beginning = 0; -} - -template <typename ItemT> -void Menu<ItemT>::clear() -{ - m_items.clear(); -} - -template <typename ItemT> -void Menu<ItemT>::highlight(size_t pos) -{ - assert(pos < m_items.size()); - m_highlight = pos; - size_t half_height = m_height/2; - if (pos < half_height) - m_beginning = 0; - else - m_beginning = pos-half_height; -} - -template <typename ItemT> -size_t Menu<ItemT>::choice() const -{ - assert(!empty()); - return m_highlight; -} - } #endif // NCMPCPP_MENU_H diff --git a/src/menu_impl.h b/src/menu_impl.h new file mode 100644 index 00000000..5fabfe5d --- /dev/null +++ b/src/menu_impl.h @@ -0,0 +1,349 @@ +/*************************************************************************** + * Copyright (C) 2008-2014 by Andrzej Rybczak * + * electricityispower@gmail.com * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef NCMPCPP_MENU_IMPL_H +#define NCMPCPP_MENU_IMPL_H + +#include "menu.h" + +namespace NC { + +template <typename ItemT> +Menu<ItemT>::Menu(size_t startx, + size_t starty, + size_t width, + size_t height, + const std::string &title, + Color color, + Border border) + : Window(startx, starty, width, height, title, std::move(color), border), + m_item_displayer(0), + m_beginning(0), + m_highlight(0), + m_highlight_color(m_base_color), + m_highlight_enabled(true), + m_cyclic_scroll_enabled(false), + m_autocenter_cursor(false) +{ +} + +template <typename ItemT> +Menu<ItemT>::Menu(const Menu &rhs) +: Window(rhs) +, m_item_displayer(rhs.m_item_displayer) +, m_beginning(rhs.m_beginning) +, m_highlight(rhs.m_highlight) +, m_highlight_color(rhs.m_highlight_color) +, m_highlight_enabled(rhs.m_highlight_enabled) +, m_cyclic_scroll_enabled(rhs.m_cyclic_scroll_enabled) +, m_autocenter_cursor(rhs.m_autocenter_cursor) +, m_drawn_position(rhs.m_drawn_position) +, m_selected_prefix(rhs.m_selected_prefix) +, m_selected_suffix(rhs.m_selected_suffix) +{ + // there is no way to properly fill m_filtered_options + // (if rhs is filtered), so we just don't do it. + m_items.reserve(rhs.m_items.size()); + std::copy(rhs.begin(), rhs.end(), std::back_inserter(m_items)); +} + +template <typename ItemT> +Menu<ItemT>::Menu(Menu &&rhs) +: Window(rhs) +, m_item_displayer(rhs.m_item_displayer) +, m_items(std::move(rhs.m_items)) +, m_beginning(rhs.m_beginning) +, m_highlight(rhs.m_highlight) +, m_highlight_color(rhs.m_highlight_color) +, m_highlight_enabled(rhs.m_highlight_enabled) +, m_cyclic_scroll_enabled(rhs.m_cyclic_scroll_enabled) +, m_autocenter_cursor(rhs.m_autocenter_cursor) +, m_drawn_position(rhs.m_drawn_position) +, m_selected_prefix(std::move(rhs.m_selected_prefix)) +, m_selected_suffix(std::move(rhs.m_selected_suffix)) +{ +} + +template <typename ItemT> +Menu<ItemT> &Menu<ItemT>::operator=(Menu rhs) +{ + std::swap(static_cast<Window &>(*this), static_cast<Window &>(rhs)); + std::swap(m_item_displayer, rhs.m_item_displayer); + std::swap(m_items, rhs.m_items); + std::swap(m_beginning, rhs.m_beginning); + std::swap(m_highlight, rhs.m_highlight); + std::swap(m_highlight_color, rhs.m_highlight_color); + std::swap(m_highlight_enabled, rhs.m_highlight_enabled); + std::swap(m_cyclic_scroll_enabled, rhs.m_cyclic_scroll_enabled); + std::swap(m_autocenter_cursor, rhs.m_autocenter_cursor); + std::swap(m_drawn_position, rhs.m_drawn_position); + std::swap(m_selected_prefix, rhs.m_selected_prefix); + std::swap(m_selected_suffix, rhs.m_selected_suffix); + return *this; +} + +template <typename ItemT> +void Menu<ItemT>::resizeList(size_t new_size) +{ + if (new_size > m_items.size()) + { + size_t old_size = m_items.size(); + m_items.resize(new_size); + for (size_t i = old_size; i < new_size; ++i) + m_items[i] = Item(); + } + else + m_items.resize(new_size); +} + +template <typename ItemT> +void Menu<ItemT>::addItem(ItemT item, bool is_bold, bool is_inactive) +{ + m_items.push_back(Item(std::move(item), is_bold, is_inactive)); +} + +template <typename ItemT> +void Menu<ItemT>::addSeparator() +{ + m_items.push_back(Item::mkSeparator()); +} + +template <typename ItemT> +void Menu<ItemT>::insertItem(size_t pos, const ItemT &item, bool is_bold, bool is_inactive) +{ + m_items.insert(m_items.begin()+pos, Item(item, is_bold, is_inactive)); +} + +template <typename ItemT> +void Menu<ItemT>::insertSeparator(size_t pos) +{ + m_items.insert(m_items.begin()+pos, Item::mkSeparator()); +} + +template <typename ItemT> +void Menu<ItemT>::deleteItem(size_t pos) +{ + assert(pos < m_items.size()); + m_items.erase(m_items.begin()+pos); +} + +template <typename ItemT> +bool Menu<ItemT>::Goto(size_t y) +{ + if (!isHighlightable(m_beginning+y)) + return false; + m_highlight = m_beginning+y; + return true; +} + +template <typename ItemT> +void Menu<ItemT>::refresh() +{ + if (m_items.empty()) + { + Window::clear(); + Window::refresh(); + return; + } + + size_t max_beginning = 0; + if (m_items.size() > m_height) + max_beginning = m_items.size() - m_height; + m_beginning = std::min(m_beginning, max_beginning); + + // if highlighted position is off the screen, make it visible + m_highlight = std::min(m_highlight, m_beginning+m_height-1); + // if highlighted position is invalid, correct it + m_highlight = std::min(m_highlight, m_items.size()-1); + + if (!isHighlightable(m_highlight)) + { + scroll(Scroll::Up); + if (!isHighlightable(m_highlight)) + scroll(Scroll::Down); + } + + size_t line = 0; + m_drawn_position = m_beginning; + for (size_t &i = m_drawn_position; i < m_beginning+m_height; ++i, ++line) + { + goToXY(0, line); + if (i >= m_items.size()) + { + for (; line < m_height; ++line) + mvwhline(m_window, line, 0, KEY_SPACE, m_width); + break; + } + if (m_items[i]->isSeparator()) + { + mvwhline(m_window, line, 0, 0, m_width); + continue; + } + if (m_items[i]->isBold()) + *this << Format::Bold; + if (m_highlight_enabled && i == m_highlight) + { + *this << Format::Reverse; + *this << m_highlight_color; + } + mvwhline(m_window, line, 0, KEY_SPACE, m_width); + if (m_items[i]->isSelected()) + *this << m_selected_prefix; + if (m_item_displayer) + m_item_displayer(*this); + if (m_items[i]->isSelected()) + *this << m_selected_suffix; + if (m_highlight_enabled && i == m_highlight) + { + *this << Color::End; + *this << Format::NoReverse; + } + if (m_items[i]->isBold()) + *this << Format::NoBold; + } + Window::refresh(); +} + +template <typename ItemT> +void Menu<ItemT>::scroll(Scroll where) +{ + if (m_items.empty()) + return; + size_t max_highlight = m_items.size()-1; + size_t max_beginning = m_items.size() < m_height ? 0 : m_items.size()-m_height; + size_t max_visible_highlight = m_beginning+m_height-1; + switch (where) + { + case Scroll::Up: + { + if (m_highlight <= m_beginning && m_highlight > 0) + --m_beginning; + if (m_highlight == 0) + { + if (m_cyclic_scroll_enabled) + return scroll(Scroll::End); + break; + } + else + --m_highlight; + if (!isHighlightable(m_highlight)) + scroll(m_highlight == 0 && !m_cyclic_scroll_enabled ? Scroll::Down : Scroll::Up); + break; + } + case Scroll::Down: + { + if (m_highlight >= max_visible_highlight && m_highlight < max_highlight) + ++m_beginning; + if (m_highlight == max_highlight) + { + if (m_cyclic_scroll_enabled) + return scroll(Scroll::Home); + break; + } + else + ++m_highlight; + if (!isHighlightable(m_highlight)) + scroll(m_highlight == max_highlight && !m_cyclic_scroll_enabled ? Scroll::Up : Scroll::Down); + break; + } + case Scroll::PageUp: + { + if (m_cyclic_scroll_enabled && m_highlight == 0) + return scroll(Scroll::End); + if (m_highlight < m_height) + m_highlight = 0; + else + m_highlight -= m_height; + if (m_beginning < m_height) + m_beginning = 0; + else + m_beginning -= m_height; + if (!isHighlightable(m_highlight)) + scroll(m_highlight == 0 && !m_cyclic_scroll_enabled ? Scroll::Down : Scroll::Up); + break; + } + case Scroll::PageDown: + { + if (m_cyclic_scroll_enabled && m_highlight == max_highlight) + return scroll(Scroll::Home); + m_highlight += m_height; + m_beginning += m_height; + m_beginning = std::min(m_beginning, max_beginning); + m_highlight = std::min(m_highlight, max_highlight); + if (!isHighlightable(m_highlight)) + scroll(m_highlight == max_highlight && !m_cyclic_scroll_enabled ? Scroll::Up : Scroll::Down); + break; + } + case Scroll::Home: + { + m_highlight = 0; + m_beginning = 0; + if (!isHighlightable(m_highlight)) + scroll(Scroll::Down); + break; + } + case Scroll::End: + { + m_highlight = max_highlight; + m_beginning = max_beginning; + if (!isHighlightable(m_highlight)) + scroll(Scroll::Up); + break; + } + } + if (m_autocenter_cursor) + highlight(m_highlight); +} + +template <typename ItemT> +void Menu<ItemT>::reset() +{ + m_highlight = 0; + m_beginning = 0; +} + +template <typename ItemT> +void Menu<ItemT>::clear() +{ + m_items.clear(); +} + +template <typename ItemT> +void Menu<ItemT>::highlight(size_t pos) +{ + assert(pos < m_items.size()); + m_highlight = pos; + size_t half_height = m_height/2; + if (pos < half_height) + m_beginning = 0; + else + m_beginning = pos-half_height; +} + +template <typename ItemT> +size_t Menu<ItemT>::choice() const +{ + assert(!empty()); + return m_highlight; +} + +} + +#endif // NCMPCPP_MENU_IMPL_H
\ No newline at end of file diff --git a/src/outputs.cpp b/src/outputs.cpp index 408afd9c..9189eb2f 100644 --- a/src/outputs.cpp +++ b/src/outputs.cpp @@ -25,6 +25,7 @@ #include "charset.h" #include "display.h" #include "global.h" +#include "menu_impl.h" #include "settings.h" #include "status.h" #include "statusbar.h" diff --git a/src/playlist.cpp b/src/playlist.cpp index bcdd3096..33b4d0d8 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -26,7 +26,7 @@ #include "display.h" #include "global.h" #include "helpers.h" -#include "menu.h" +#include "menu_impl.h" #include "playlist.h" #include "screen_switcher.h" #include "song.h" diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index d881c134..9826de85 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -29,6 +29,7 @@ #include "helpers.h" #include "playlist.h" #include "playlist_editor.h" +#include "menu_impl.h" #include "mpdpp.h" #include "status.h" #include "statusbar.h" diff --git a/src/search_engine.cpp b/src/search_engine.cpp index 422a3483..e0a304e4 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -26,6 +26,7 @@ #include "display.h" #include "global.h" #include "helpers.h" +#include "menu_impl.h" #include "playlist.h" #include "search_engine.h" #include "settings.h" diff --git a/src/sel_items_adder.cpp b/src/sel_items_adder.cpp index 109a13e7..a846cb8d 100644 --- a/src/sel_items_adder.cpp +++ b/src/sel_items_adder.cpp @@ -24,6 +24,7 @@ #include "browser.h" #include "global.h" #include "helpers.h" +#include "menu_impl.h" #include "mpdpp.h" #include "playlist.h" #include "sel_items_adder.h" diff --git a/src/sort_playlist.cpp b/src/sort_playlist.cpp index 4a460698..bada7963 100644 --- a/src/sort_playlist.cpp +++ b/src/sort_playlist.cpp @@ -25,6 +25,7 @@ #include "global.h" #include "helpers.h" #include "playlist.h" +#include "menu_impl.h" #include "settings.h" #include "sort_playlist.h" #include "statusbar.h" diff --git a/src/status.cpp b/src/status.cpp index 8db7a6d6..33a801f1 100644 --- a/src/status.cpp +++ b/src/status.cpp @@ -29,6 +29,7 @@ #include "helpers.h" #include "lyrics.h" #include "media_library.h" +#include "menu_impl.h" #include "outputs.h" #include "playlist.h" #include "playlist_editor.h" diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp index c13761a9..29588df2 100644 --- a/src/tag_editor.cpp +++ b/src/tag_editor.cpp @@ -33,6 +33,7 @@ #include "display.h" #include "global.h" #include "helpers.h" +#include "menu_impl.h" #include "playlist.h" #include "song_info.h" #include "statusbar.h" diff --git a/src/tiny_tag_editor.cpp b/src/tiny_tag_editor.cpp index 6a7efd7c..a18698b3 100644 --- a/src/tiny_tag_editor.cpp +++ b/src/tiny_tag_editor.cpp @@ -33,6 +33,7 @@ #include "display.h" #include "helpers.h" #include "global.h" +#include "menu_impl.h" #include "song_info.h" #include "playlist.h" #include "search_engine.h" |