← Back to branch summary

~ubuntu-branches/ubuntu/natty/smplayer/natty

« back to all changes in this revision

Viewing changes to src/mplayerprocess.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Maia Kozheva
  • Date: 2009-11-04 12:45:38 UTC
  • mfrom: (1.1.10 upstream) (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104124538-hm6jc89qrg3l2sm8
Tags: 0.6.8-1
http://bugs.debian.org/543156
http://bugs.debian.org/526353
* New upstream release. (Closes: #543156)
* Added /usr/share/pixmaps to debian/menu. (Closes: #526353)
* debian/control: Bumped Standards-Version to 3.8.3.
* debian/rules:
  - Removed VERSION variables, not relevant anymore.
  - Removed dh_desktop.
* Removed 01_gl_translation.patch, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mplayerprocess.cpp
24
24
#include "global.h"
25
25
#include "preferences.h"
26
26
#include "mplayerversion.h"
27
 
#include "helper.h"
 
27
#include "colorutils.h"
28
28
 
29
29
using namespace Global;
30
30
 
117
117
#if DVDNAV_SUPPORT
118
118
static QRegExp rx_dvdnav_switch_title("^DVDNAV, switched to title: (\\d+)");
119
119
static QRegExp rx_dvdnav_length("^ANS_length=(.*)");
 
120
static QRegExp rx_dvdnav_title_is_menu("^DVDNAV_TITLE_IS_MENU");
 
121
static QRegExp rx_dvdnav_title_is_movie("^DVDNAV_TITLE_IS_MOVIE");
120
122
#endif
121
123
 
122
124
// VCD
136
138
static QRegExp rx_audio_info("^ID_AID_(\\d+)_(LANG|NAME)=(.*)");
137
139
#endif
138
140
 
 
141
#if PROGRAM_SWITCH
 
142
static QRegExp rx_program("^PROGRAM_ID=(\\d+)");
 
143
#endif
 
144
 
139
145
//Clip info
140
146
static QRegExp rx_clip_name("^ (name|title): (.*)", Qt::CaseInsensitive);
141
147
static QRegExp rx_clip_artist("^ artist: (.*)", Qt::CaseInsensitive);
158
164
        QString value;
159
165
 
160
166
#if COLOR_OUTPUT_SUPPORT
161
 
    QString line = Helper::stripColorsTags(QString::fromLocal8Bit(ba));
 
167
    QString line = ColorUtils::stripColorsTags(QString::fromLocal8Bit(ba));
162
168
#else
163
169
        QString line = QString::fromLocal8Bit(ba);
164
170
#endif
384
390
                                emit receivedDuration(length);
385
391
                        }
386
392
                }
 
393
                if (rx_dvdnav_title_is_menu.indexIn(line) > -1) {
 
394
                        emit receivedTitleIsMenu();
 
395
                }
 
396
                if (rx_dvdnav_title_is_movie.indexIn(line) > -1) {
 
397
                        emit receivedTitleIsMovie();
 
398
                }
387
399
#endif
388
400
 
389
401
                // The following things are not sent when the file has started to play
439
451
                else
440
452
#endif
441
453
 
 
454
#if PROGRAM_SWITCH
 
455
                // Program
 
456
                if (rx_program.indexIn(line) > -1) {
 
457
                        int ID = rx_program.cap(1).toInt();
 
458
                        qDebug("MplayerProcess::parseLine: Program: ID: %d", ID);
 
459
                        md.programs.addID( ID );
 
460
                }
 
461
                else
 
462
#endif
 
463
 
442
464
                // Video tracks
443
465
                if (rx_video.indexIn(line) > -1) {
444
466
                        int ID = rx_video.cap(1).toInt();