diff --git a/main.cpp b/main.cpp index f1e0bc6..2c7cbbb 100644 --- a/main.cpp +++ b/main.cpp @@ -9,24 +9,28 @@ #include #include #include +#include +#include #include "player.h" -// """ Version 0.8 """ +// """ Version 0.9 """ //using namespace std; - int main(int argc, char* argv[]) { QApplication app(argc, argv); QWidget window; - window.setGeometry(20,50,1270,576); + window.setGeometry(20,50,1270,590); - QMenuBar mBar; - QMenu fileMenu; - fileMenu.addMenu("Test"); - mBar.addMenu(&fileMenu); + QMenuBar menuBar(&window); + QMenu *fileMenu; + QMenu *workMenu; + fileMenu=menuBar.addMenu("&Datei"); + workMenu=menuBar.addMenu("&Bearbeiten"); + fileMenu->addAction("Be&enden", exit); + workMenu->addAction("&IP-Adresse", exit); QFrame videoWidget; Player player(&videoWidget); @@ -42,8 +46,11 @@ int main(int argc, char* argv[]) { liste.setSizePolicy(sp); QGridLayout gridLayout; - gridLayout.addWidget(&videoWidget, 0, 0); - gridLayout.addWidget(&liste, 0, 1); + gridLayout.setMargin(0); + gridLayout.setSpacing(0); + gridLayout.addWidget(&menuBar, 0, 0, 1, 0); + gridLayout.addWidget(&videoWidget, 1, 0); + gridLayout.addWidget(&liste, 1, 1); window.setLayout(&gridLayout); window.show(); diff --git a/player.cpp b/player.cpp index 7becc69..f0a2787 100644 --- a/player.cpp +++ b/player.cpp @@ -114,7 +114,6 @@ int Player::play(QListWidgetItem *item){ if(mp) libvlc_media_player_stop (mp); - QByteArray bla = URL[x].toLatin1(); const char *url = bla.data(); @@ -130,7 +129,8 @@ int Player::play(QListWidgetItem *item){ #elif defined(Q_OS_MAC) // Mac libvlc_media_player_set_nsobject(mp, (void *)videoWidget->winId()); // view #else //Linux - libvlc_media_player_set_xwindow (mp, (void *)videoWidget->winId()); // xid + int windid = videoWidget->winId(); + libvlc_media_player_set_xwindow (mp, windid); // xid #endif std::cout << "play..." << std::endl; diff --git a/vlc-vdr.pro b/vlc-vdr.pro index 91355e0..512b6ed 100644 --- a/vlc-vdr.pro +++ b/vlc-vdr.pro @@ -7,10 +7,10 @@ SOURCES += \ main.cpp \ player.cpp -LIBS += -lcurl -llibvlc +LIBS += -lcurl -lvlc DEFINES += CURL_STATICLIB VLC_STATICLIB HEADERS += \ player.h - +#CONFIG+= static