diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/apps/mplayerc/PlayerNavigationDialog.cpp | |
parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/PlayerNavigationDialog.cpp')
-rw-r--r-- | src/apps/mplayerc/PlayerNavigationDialog.cpp | 214 |
1 files changed, 107 insertions, 107 deletions
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.cpp b/src/apps/mplayerc/PlayerNavigationDialog.cpp index 756d759a9..4d5a642eb 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.cpp +++ b/src/apps/mplayerc/PlayerNavigationDialog.cpp @@ -32,7 +32,7 @@ // IMPLEMENT_DYNAMIC(CPlayerNavigationDialog, CResizableDialog)
CPlayerNavigationDialog::CPlayerNavigationDialog()
- : CResizableDialog(CPlayerNavigationDialog::IDD, NULL)
+ : CResizableDialog(CPlayerNavigationDialog::IDD, NULL)
{
}
@@ -43,40 +43,40 @@ CPlayerNavigationDialog::~CPlayerNavigationDialog() BOOL CPlayerNavigationDialog::Create(CWnd* pParent)
{
- if(!__super::Create(IDD, pParent))
- return FALSE;
- m_pParent = pParent;
- return TRUE;
+ if(!__super::Create(IDD, pParent))
+ return FALSE;
+ m_pParent = pParent;
+ return TRUE;
}
void CPlayerNavigationDialog::DoDataExchange(CDataExchange* pDX)
{
- __super::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_LISTCHANNELS, m_ChannelList);
- DDX_Control(pDX, IDC_NAVIGATION_AUDIO, m_ComboAudio);
- DDX_Control(pDX, IDC_NAVIGATION_INFO, m_ButtonInfo);
- DDX_Control(pDX, IDC_NAVIGATION_SCAN, m_ButtonScan);
+ __super::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_LISTCHANNELS, m_ChannelList);
+ DDX_Control(pDX, IDC_NAVIGATION_AUDIO, m_ComboAudio);
+ DDX_Control(pDX, IDC_NAVIGATION_INFO, m_ButtonInfo);
+ DDX_Control(pDX, IDC_NAVIGATION_SCAN, m_ButtonScan);
}
BOOL CPlayerNavigationDialog::PreTranslateMessage(MSG* pMsg)
{
- if(pMsg->message == WM_KEYDOWN)
- {
- if(pMsg->wParam == VK_RETURN)
- {
- CWnd* pFocused = GetFocus();
- }
- }
- return __super::PreTranslateMessage(pMsg);
+ if(pMsg->message == WM_KEYDOWN)
+ {
+ if(pMsg->wParam == VK_RETURN)
+ {
+ CWnd* pFocused = GetFocus();
+ }
+ }
+ return __super::PreTranslateMessage(pMsg);
}
BEGIN_MESSAGE_MAP(CPlayerNavigationDialog, CResizableDialog)
- ON_WM_DESTROY()
- ON_LBN_SELCHANGE(IDC_LISTCHANNELS, OnChangeChannel)
- ON_CBN_SELCHANGE(IDC_NAVIGATION_AUDIO, OnSelChangeComboAudio)
- ON_BN_CLICKED(IDC_NAVIGATION_INFO, OnButtonInfo)
- ON_BN_CLICKED(IDC_NAVIGATION_SCAN, OnTunerScan)
+ ON_WM_DESTROY()
+ ON_LBN_SELCHANGE(IDC_LISTCHANNELS, OnChangeChannel)
+ ON_CBN_SELCHANGE(IDC_NAVIGATION_AUDIO, OnSelChangeComboAudio)
+ ON_BN_CLICKED (IDC_NAVIGATION_INFO, OnButtonInfo)
+ ON_BN_CLICKED(IDC_NAVIGATION_SCAN, OnTunerScan)
END_MESSAGE_MAP()
@@ -85,127 +85,127 @@ END_MESSAGE_MAP() BOOL CPlayerNavigationDialog::OnInitDialog()
{
- __super::OnInitDialog();
- return TRUE; // return TRUE unless you set the focus to a control
- // EXCEPTION: OCX Property Pages should return FALSE
+ __super::OnInitDialog();
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
}
void CPlayerNavigationDialog::OnDestroy()
{
- m_ChannelList.ResetContent();
- __super::OnDestroy();
+ m_ChannelList.ResetContent();
+ __super::OnDestroy();
}
void CPlayerNavigationDialog::OnChangeChannel()
{
- CWnd* TempWnd;
+ CWnd* TempWnd;
int nItem;
- TempWnd = static_cast<CPlayerNavigationBar*>(m_pParent) -> m_pParent;
- nItem = p_nItems[m_ChannelList.GetCurSel()] + ID_NAVIGATE_CHAP_SUBITEM_START;
- static_cast<CMainFrame*>(TempWnd) -> OnNavigateChapters(nItem);
- SetupAudioSwitcherSubMenu();
+ TempWnd = static_cast<CPlayerNavigationBar*> (m_pParent) -> m_pParent;
+ nItem = p_nItems[m_ChannelList.GetCurSel()] + ID_NAVIGATE_CHAP_SUBITEM_START;
+ static_cast<CMainFrame*> (TempWnd) -> OnNavigateChapters(nItem);
+ SetupAudioSwitcherSubMenu();
}
void CPlayerNavigationDialog::SetupAudioSwitcherSubMenu(CDVBChannel* pChannel)
{
- bool bFound = FALSE;
- int nCurrentChannel;
- AppSettings& s = AfxGetAppSettings();
-
- if(!pChannel)
- {
- nCurrentChannel = s.DVBLastChannel;
- POSITION pos = s.DVBChannels.GetHeadPosition();
- while(pos && !bFound)
- {
- pChannel = &s.DVBChannels.GetNext(pos);
- if(nCurrentChannel == pChannel->GetPrefNumber())
- {
- bFound = TRUE;
- break;
- }
- }
- }
-
- m_ComboAudio.ResetContent();
- for(int i = 0; i < pChannel->GetAudioCount(); i++)
- {
- m_ComboAudio.AddString(pChannel->GetAudio(i)->Language);
- m_audios[i].PID = pChannel->GetAudio(i)-> PID;
- m_audios[i].Type = pChannel->GetAudio(i)->Type;
- m_audios[i].PesType = pChannel->GetAudio(i) -> PesType;
- m_audios[i].Language = pChannel->GetAudio(i) -> Language;
- }
-
- m_ComboAudio.SetCurSel(0); // TODO: managing default languages
-
+ bool bFound = FALSE;
+ int nCurrentChannel;
+ AppSettings& s = AfxGetAppSettings();
+
+ if (!pChannel)
+ {
+ nCurrentChannel = s.DVBLastChannel;
+ POSITION pos = s.DVBChannels.GetHeadPosition();
+ while (pos && !bFound)
+ {
+ pChannel = &s.DVBChannels.GetNext(pos);
+ if (nCurrentChannel == pChannel->GetPrefNumber())
+ {
+ bFound = TRUE;
+ break;
+ }
+ }
+ }
+
+ m_ComboAudio.ResetContent();
+ for (int i=0; i < pChannel->GetAudioCount(); i++)
+ {
+ m_ComboAudio.AddString(pChannel->GetAudio(i)->Language);
+ m_audios[i].PID = pChannel->GetAudio(i)-> PID;
+ m_audios[i].Type = pChannel->GetAudio(i)->Type;
+ m_audios[i].PesType = pChannel->GetAudio(i) -> PesType;
+ m_audios[i].Language = pChannel->GetAudio(i) -> Language;
+ }
+
+ m_ComboAudio.SetCurSel(0); // TODO: managing default languages
+
}
void CPlayerNavigationDialog::UpdateElementList()
{
- int nItem;
- int nCurrentChannel;
- AppSettings& s = AfxGetAppSettings();
-
- if(s.iDefaultCaptureDevice = 1)
- {
- m_ChannelList.ResetContent();
-
- nCurrentChannel = s.DVBLastChannel;
-
- POSITION pos = s.DVBChannels.GetHeadPosition();
- while(pos)
- {
- CDVBChannel& Channel = s.DVBChannels.GetNext(pos);
-
- nItem = m_ChannelList.AddString(Channel.GetName());
- if(nItem < MAX_CHANNELS_ALLOWED)
- p_nItems [nItem] = Channel.GetPrefNumber();
- if(nCurrentChannel == Channel.GetPrefNumber())
- {
- m_ChannelList.SetCurSel(nItem);
- SetupAudioSwitcherSubMenu(&Channel);
- }
- }
- }
+ int nItem;
+ int nCurrentChannel;
+ AppSettings& s = AfxGetAppSettings();
+
+ if (s.iDefaultCaptureDevice = 1)
+ {
+ m_ChannelList.ResetContent();
+
+ nCurrentChannel = s.DVBLastChannel;
+
+ POSITION pos = s.DVBChannels.GetHeadPosition();
+ while (pos)
+ {
+ CDVBChannel& Channel = s.DVBChannels.GetNext(pos);
+
+ nItem = m_ChannelList.AddString (Channel.GetName());
+ if (nItem < MAX_CHANNELS_ALLOWED)
+ p_nItems [nItem] = Channel.GetPrefNumber();
+ if (nCurrentChannel == Channel.GetPrefNumber())
+ {
+ m_ChannelList.SetCurSel(nItem);
+ SetupAudioSwitcherSubMenu(&Channel);
+ }
+ }
+ }
}
void CPlayerNavigationDialog::UpdatePos(int nID)
{
- for(int i = 0; i < MAX_CHANNELS_ALLOWED; i++)
- {
- if(p_nItems [i] == nID)
- {
- m_ChannelList.SetCurSel(i);
- break;
- }
-
- }
+ for (int i=0; i < MAX_CHANNELS_ALLOWED; i++)
+ {
+ if (p_nItems [i] == nID)
+ {
+ m_ChannelList.SetCurSel(i);
+ break;
+ }
+
+ }
}
void CPlayerNavigationDialog::OnTunerScan()
{
- CWnd* TempWnd;
+ CWnd* TempWnd;
- TempWnd = static_cast<CPlayerNavigationBar*>(m_pParent) -> m_pParent;
- static_cast<CMainFrame*>(TempWnd) -> OnTunerScan();
+ TempWnd = static_cast<CPlayerNavigationBar*> (m_pParent) -> m_pParent;
+ static_cast<CMainFrame*> (TempWnd) -> OnTunerScan();
}
void CPlayerNavigationDialog::OnSelChangeComboAudio()
{
- UINT nID;
- CWnd* TempWnd;
+ UINT nID;
+ CWnd* TempWnd;
- nID = m_ComboAudio.GetCurSel() + ID_NAVIGATE_AUDIO_SUBITEM_START;
+ nID = m_ComboAudio.GetCurSel() + ID_NAVIGATE_AUDIO_SUBITEM_START;
- TempWnd = static_cast<CPlayerNavigationBar*>(m_pParent) -> m_pParent;
- static_cast<CMainFrame*>(TempWnd) -> OnNavigateAudio(nID);
+ TempWnd = static_cast<CPlayerNavigationBar*> (m_pParent) -> m_pParent;
+ static_cast<CMainFrame*> (TempWnd) -> OnNavigateAudio(nID);
}
void CPlayerNavigationDialog::OnButtonInfo()
{
- // TODO: Retrieve and show channel info
+ // TODO: Retrieve and show channel info
}
|