Skip to content

Commit

Permalink
Rename Program (player) to Project.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Feb 23, 2016
1 parent f57aa4d commit d1bf4f6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ void MainWindow::seekPlaylist(int start)
updateMarkers();
MLT.seek(start);
m_player->setFocus();
m_player->switchToTab(Player::ProgramTabIndex);
m_player->switchToTab(Player::ProjectTabIndex);
}

void MainWindow::seekTimeline(int position)
Expand All @@ -1137,7 +1137,7 @@ void MainWindow::seekTimeline(int position)
m_filterController->setProducer();
updateMarkers();
m_player->setFocus();
m_player->switchToTab(Player::ProgramTabIndex);
m_player->switchToTab(Player::ProjectTabIndex);
m_timelineDock->emitSelectedFromSelection();
}
m_player->seek(position);
Expand Down Expand Up @@ -1487,7 +1487,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
case Qt::Key_Escape: // Avid Toggle Active Monitor
if (MLT.isPlaylist()) {
if (multitrack())
m_player->onTabBarClicked(Player::ProgramTabIndex);
m_player->onTabBarClicked(Player::ProjectTabIndex);
else if (MLT.savedProducer())
m_player->onTabBarClicked(Player::SourceTabIndex);
else
Expand All @@ -1498,7 +1498,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
// TODO else open clip under playhead of current track if available
} else {
if (multitrack() || (playlist() && playlist()->count() > 0))
m_player->onTabBarClicked(Player::ProgramTabIndex);
m_player->onTabBarClicked(Player::ProjectTabIndex);
}
break;
case Qt::Key_Up:
Expand Down Expand Up @@ -1798,8 +1798,8 @@ void MainWindow::onProducerOpened()
m_player->setOut(-1);
m_playlistDock->setVisible(true);
m_playlistDock->raise();
m_player->enableTab(Player::ProgramTabIndex);
m_player->switchToTab(Player::ProgramTabIndex);
m_player->enableTab(Player::ProjectTabIndex);
m_player->switchToTab(Player::ProjectTabIndex);
}
}
else if (MLT.isMultitrack()) {
Expand All @@ -1809,8 +1809,8 @@ void MainWindow::onProducerOpened()
m_player->setOut(-1);
m_timelineDock->setVisible(true);
m_timelineDock->raise();
m_player->enableTab(Player::ProgramTabIndex);
m_player->switchToTab(Player::ProgramTabIndex);
m_player->enableTab(Player::ProjectTabIndex);
m_player->switchToTab(Player::ProjectTabIndex);
m_timelineDock->emitSelectedFromSelection();
}
}
Expand Down Expand Up @@ -1992,13 +1992,13 @@ void MainWindow::onFiltersDockTriggered(bool checked)
void MainWindow::onPlaylistCreated()
{
if (!playlist() || playlist()->count() == 0) return;
m_player->enableTab(Player::ProgramTabIndex, true);
m_player->enableTab(Player::ProjectTabIndex, true);
}

void MainWindow::onPlaylistLoaded()
{
updateMarkers();
m_player->enableTab(Player::ProgramTabIndex, true);
m_player->enableTab(Player::ProjectTabIndex, true);
}

void MainWindow::onPlaylistCleared()
Expand All @@ -2017,7 +2017,7 @@ void MainWindow::onPlaylistClosed()
m_undoStack->clear();
MLT.resetURL();
if (!multitrack())
m_player->enableTab(Player::ProgramTabIndex, false);
m_player->enableTab(Player::ProjectTabIndex, false);
}

void MainWindow::onPlaylistModified()
Expand All @@ -2026,12 +2026,12 @@ void MainWindow::onPlaylistModified()
if (MLT.producer() && playlist() && (void*) MLT.producer()->get_producer() == (void*) playlist()->get_playlist())
m_player->onProducerModified();
updateMarkers();
m_player->enableTab(Player::ProgramTabIndex, true);
m_player->enableTab(Player::ProjectTabIndex, true);
}

void MainWindow::onMultitrackCreated()
{
m_player->enableTab(Player::ProgramTabIndex, true);
m_player->enableTab(Player::ProjectTabIndex, true);
}

void MainWindow::onMultitrackClosed()
Expand All @@ -2043,7 +2043,7 @@ void MainWindow::onMultitrackClosed()
m_undoStack->clear();
MLT.resetURL();
if (!playlist() || playlist()->count() == 0)
m_player->enableTab(Player::ProgramTabIndex, false);
m_player->enableTab(Player::ProjectTabIndex, false);
}

void MainWindow::onMultitrackModified()
Expand Down Expand Up @@ -2349,7 +2349,7 @@ void MainWindow::stepRightOneSecond()

void MainWindow::setInToCurrent(bool ripple)
{
if (m_player->tabIndex() == Player::ProgramTabIndex && multitrack()) {
if (m_player->tabIndex() == Player::ProjectTabIndex && multitrack()) {
m_timelineDock->trimClipAtPlayhead(TimelineDock::TrimInPoint, ripple);
} else if (MLT.isSeekable() && MLT.isClip()) {
m_player->setIn(m_player->position());
Expand All @@ -2358,7 +2358,7 @@ void MainWindow::setInToCurrent(bool ripple)

void MainWindow::setOutToCurrent(bool ripple)
{
if (m_player->tabIndex() == Player::ProgramTabIndex && multitrack()) {
if (m_player->tabIndex() == Player::ProjectTabIndex && multitrack()) {
m_timelineDock->trimClipAtPlayhead(TimelineDock::TrimOutPoint, ripple);
} else if (MLT.isSeekable() && MLT.isClip()) {
m_player->setOut(m_player->position());
Expand Down
6 changes: 3 additions & 3 deletions src/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ Player::Player(QWidget *parent)
m_tabs = new QTabBar;
m_tabs->setShape(QTabBar::RoundedSouth);
m_tabs->addTab(tr("Source"));
m_tabs->addTab(tr("Program"));
m_tabs->setTabEnabled(ProgramTabIndex, false);
m_tabs->addTab(tr("Project"));
m_tabs->setTabEnabled(ProjectTabIndex, false);
QHBoxLayout* tabLayout = new QHBoxLayout;
tabLayout->addWidget(m_tabs);
tabLayout->addStretch();
Expand Down Expand Up @@ -683,7 +683,7 @@ void Player::onTabBarClicked(int index)
MAIN.open(new Mlt::Producer(MLT.savedProducer()));
}
break;
case ProgramTabIndex:
case ProjectTabIndex:
if (MAIN.multitrack()) {
if (!MLT.isMultitrack() && MAIN.multitrack())
MAIN.seekTimeline(MAIN.multitrack()->position());
Expand Down
2 changes: 1 addition & 1 deletion src/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Player : public QWidget
public:
typedef enum {
SourceTabIndex = 0,
ProgramTabIndex
ProjectTabIndex
} TabIndex;

explicit Player(QWidget *parent = 0);
Expand Down

0 comments on commit d1bf4f6

Please sign in to comment.