Diffstat (limited to 'noncore/multimedia/opieplayer3/playlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer3/playlist.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer3/playlist.cpp b/noncore/multimedia/opieplayer3/playlist.cpp index 2eb40e3..6f2e668 100644 --- a/noncore/multimedia/opieplayer3/playlist.cpp +++ b/noncore/multimedia/opieplayer3/playlist.cpp | |||
@@ -155,24 +155,26 @@ void PlaylistView::addFile(const QString&aFile,const QString&aName) | |||
155 | break; | 155 | break; |
156 | case 4: | 156 | case 4: |
157 | msg+=tr("Malformed mrl"); | 157 | msg+=tr("Malformed mrl"); |
158 | break; | 158 | break; |
159 | default: | 159 | default: |
160 | msg += tr("Unknown error"); | 160 | msg += tr("Unknown error"); |
161 | break; | 161 | break; |
162 | } | 162 | } |
163 | QMessageBox::warning(0,tr("Error reading fileheader"),msg); | 163 | QMessageBox::warning(0,tr("Error reading fileheader"),msg); |
164 | return; | 164 | return; |
165 | } | 165 | } |
166 | m_lastItem = m_items.last(); | 166 | m_lastItem = m_items.last(); |
167 | PlaylistItem*_it = currentItem(); | ||
168 | |||
167 | if (m_lastItem) { | 169 | if (m_lastItem) { |
168 | m_lastItem = new PlaylistItem(aFile,this,m_lastItem); | 170 | m_lastItem = new PlaylistItem(aFile,this,m_lastItem); |
169 | } else { | 171 | } else { |
170 | m_lastItem = new PlaylistItem(aFile,this); | 172 | m_lastItem = new PlaylistItem(aFile,this); |
171 | } | 173 | } |
172 | m_lastItem->setExpandable(false); | 174 | m_lastItem->setExpandable(false); |
173 | m_lastItem->setText(1,name); | 175 | m_lastItem->setText(1,name); |
174 | 176 | ||
175 | QString codec = m_Infolib->metaInfo(6); | 177 | QString codec = m_Infolib->metaInfo(6); |
176 | if (codec.isEmpty()) { | 178 | if (codec.isEmpty()) { |
177 | codec = m_Infolib->metaInfo(7); | 179 | codec = m_Infolib->metaInfo(7); |
178 | } | 180 | } |
@@ -190,25 +192,27 @@ void PlaylistView::addFile(const QString&aFile,const QString&aName) | |||
190 | int m = l/60; | 192 | int m = l/60; |
191 | l-=m*60; | 193 | l-=m*60; |
192 | codec = ""; | 194 | codec = ""; |
193 | if (h>0) { | 195 | if (h>0) { |
194 | codec.sprintf("%2i:%2i:%2i h",h,m,l); | 196 | codec.sprintf("%2i:%2i:%2i h",h,m,l); |
195 | } else { | 197 | } else { |
196 | codec.sprintf("%02i:%02i m",m,l); | 198 | codec.sprintf("%02i:%02i m",m,l); |
197 | } | 199 | } |
198 | // time | 200 | // time |
199 | m_lastItem->setText(COL_TIME,codec); | 201 | m_lastItem->setText(COL_TIME,codec); |
200 | m_lastItem->Video(m_Infolib->hasVideo()); | 202 | m_lastItem->Video(m_Infolib->hasVideo()); |
201 | m_items.append(m_lastItem); | 203 | m_items.append(m_lastItem); |
202 | setSelected(m_lastItem,true); | 204 | if (_it==NULL) { |
205 | setSelected(m_lastItem,true); | ||
206 | } | ||
203 | } | 207 | } |
204 | 208 | ||
205 | void PlaylistView::slotAppendDir() | 209 | void PlaylistView::slotAppendDir() |
206 | { | 210 | { |
207 | QString _dir = Opie::Ui::OFileDialog::getDirectory(Opie::Ui::OFileSelector::Extended,m_lastDir,0,m_lastDir); | 211 | QString _dir = Opie::Ui::OFileDialog::getDirectory(Opie::Ui::OFileSelector::Extended,m_lastDir,0,m_lastDir); |
208 | if (_dir.isEmpty()) return; | 212 | if (_dir.isEmpty()) return; |
209 | m_lastDir = _dir; | 213 | m_lastDir = _dir; |
210 | QDir sDir(_dir); | 214 | QDir sDir(_dir); |
211 | QStringList list = sDir.entryList(DEFAULT_FILE_TYPES,QDir::Files,QDir::Name | QDir::IgnoreCase); | 215 | QStringList list = sDir.entryList(DEFAULT_FILE_TYPES,QDir::Files,QDir::Name | QDir::IgnoreCase); |
212 | for (unsigned i = 0; i < list.count();++i) { | 216 | for (unsigned i = 0; i < list.count();++i) { |
213 | addFile(_dir+QString("/")+list[i]); | 217 | addFile(_dir+QString("/")+list[i]); |
214 | } | 218 | } |