Changeset 176 for smplayer/trunk/src/tvlist.h

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:

• . (modified) (1 prop)
• src/tvlist.h (modified) (3 diffs)

smplayer/trunk/src/tvlist.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
 */
 
-#ifndef _TVLIST_H_
-#define _TVLIST_H_
+#ifndef TVLIST_H
+#define TVLIST_H
 
 #include "favorites.h"
@@ -36 +36 @@
 
 #ifndef Q_OS_WIN
+        static QString findChannelsFile();
+#endif
+
+#ifndef Q_OS_WIN
 protected:
         void parse_channels_conf(Services services);