mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
55ba7c46c6
commit
9fdc36bac5
121 changed files with 755 additions and 3237 deletions
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <gtkmm/messagedialog.h>
|
||||
|
||||
#include <pbd/lockmonitor.h>
|
||||
#include <glibmm/thread.h>
|
||||
|
||||
#include <ardour/io.h>
|
||||
#include <ardour/route.h>
|
||||
|
|
@ -368,7 +368,7 @@ IOSelector::display_ports ()
|
|||
TreeView *selected_port_tview = 0;
|
||||
|
||||
{
|
||||
LockMonitor lm (port_display_lock, __LINE__, __FILE__);
|
||||
Glib::Mutex::Lock lm (port_display_lock);
|
||||
Port *port;
|
||||
uint32_t limit;
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ IOSelector::port_column_button_release (GdkEventButton* event, TreeView* treevie
|
|||
if (Keyboard::is_delete_event (event)) {
|
||||
Port* port;
|
||||
{
|
||||
LockMonitor lm (port_display_lock, __LINE__, __FILE__);
|
||||
Glib::Mutex::Lock lm (port_display_lock);
|
||||
|
||||
port = static_cast<Port *> (treeview->get_data (_("port")));
|
||||
|
||||
|
|
@ -724,7 +724,7 @@ IOSelector::select_treeview (TreeView* tview)
|
|||
switch.
|
||||
*/
|
||||
|
||||
LockMonitor lm (port_display_lock, __LINE__, __FILE__);
|
||||
Glib::Mutex::Lock lm (port_display_lock);
|
||||
Port* port = reinterpret_cast<Port *> (tview->get_data (_("port")));
|
||||
|
||||
if (port != selected_port) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue