Ignore:
Timestamp:
May 3, 2016, 5:25:45 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: update trunk to version 16.4

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/filepropertiesdialog.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify
     
    1717*/
    1818
    19 #ifndef _FILEPROPERTIESDIALOG_H_
    20 #define _FILEPROPERTIESDIALOG_H_
     19#ifndef FILEPROPERTIESDIALOG_H
     20#define FILEPROPERTIESDIALOG_H
    2121
    2222#include "ui_filepropertiesdialog.h"
    2323#include "inforeader.h"
    2424#include "mediadata.h"
     25#include "config.h"
    2526
    2627class QPushButton;
     
    3637        void setMediaData(MediaData md);
    3738
     39#if ALLOW_DEMUXER_CODEC_CHANGE
     40        // Call it as soon as possible
     41        void setCodecs(InfoList vc, InfoList ac, InfoList demuxer);
     42
    3843        void setDemuxer(QString demuxer, QString original_demuxer="");
    3944        QString demuxer();
     
    4449        void setAudioCodec(QString ac, QString original_ac="");
    4550        QString audioCodec();
     51#endif
    4652
    4753        void setMplayerAdditionalArguments(QString args);
     
    6167        void applied();
    6268
     69#if ALLOW_DEMUXER_CODEC_CHANGE
    6370protected slots:
    6471        virtual void on_resetDemuxerButton_clicked();
    6572        virtual void on_resetACButton_clicked();
    6673        virtual void on_resetVCButton_clicked();
     74#endif
    6775
    6876protected:
    69         // Call it as soon as possible
    70         void setCodecs(InfoList vc, InfoList ac, InfoList demuxer);
     77#if ALLOW_DEMUXER_CODEC_CHANGE
    7178        bool hasCodecsList() { return codecs_set; };
    72 
    7379        int find(QString s, InfoList &list);
     80#endif
    7481        void showInfo();
    7582
     
    7986
    8087private:
     88#if ALLOW_DEMUXER_CODEC_CHANGE
    8189        bool codecs_set;
    8290        InfoList vclist, aclist, demuxerlist;
    8391        QString orig_demuxer, orig_ac, orig_vc;
     92#endif
    8493        MediaData media_data;
    8594
Note: See TracChangeset for help on using the changeset viewer.