rename examples

TommyZhang936 · May 23, 2013 · 90b283f · 90b283f
1 parent 5126ab4
commit 90b283f
Show file tree

Hide file tree

Showing 29 changed files with 5 additions and 15 deletions.
diff --git a/examples/examples.pro b/examples/examples.pro
@@ -1,17 +1,17 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    simpleplayer \
+    vo-qt \
+    player \
     videographicsitem \
     videowall
-
 #TODO: mingw cross
 config_gdiplus {
-    SUBDIRS += player-gdi
+    SUBDIRS += vo-gdi
 }
 config_direct2d {
-    SUBDIRS += player-d2d
+    SUBDIRS += vo-d2d
 }
 config_gl {
-    SUBDIRS += player-gl
+    SUBDIRS += vo-gl
 }
diff --git a/examples/simpleplayer/Button.cpp → examples/player/Button.cpp b/examples/simpleplayer/Button.cpp → examples/player/Button.cpp
diff --git a/examples/simpleplayer/Button.h → examples/player/Button.h b/examples/simpleplayer/Button.h → examples/player/Button.h
diff --git a/examples/simpleplayer/MainWindow.cpp → examples/player/MainWindow.cpp b/examples/simpleplayer/MainWindow.cpp → examples/player/MainWindow.cpp
diff --git a/examples/simpleplayer/MainWindow.h → examples/player/MainWindow.h b/examples/simpleplayer/MainWindow.h → examples/player/MainWindow.h
diff --git a/examples/simpleplayer/Slider.cpp → examples/player/Slider.cpp b/examples/simpleplayer/Slider.cpp → examples/player/Slider.cpp
diff --git a/examples/simpleplayer/Slider.h → examples/player/Slider.h b/examples/simpleplayer/Slider.h → examples/player/Slider.h
diff --git a/examples/simpleplayer/main.cpp → examples/player/main.cpp b/examples/simpleplayer/main.cpp → examples/player/main.cpp
@@ -149,13 +149,6 @@ int main(int argc, char *argv[])
     if (!media_file.isEmpty()) {
         window.play(media_file);
     }
-    /*
-    AVPlayer player;
-    player.setRenderer(renderer);
-    if (!media_file.isEmpty()) {
-        player.play(media_file);
-    }
-    */
     int ret = a.exec();
     delete renderer;
     return ret;

diff --git a/examples/simpleplayer/simpleplayer.pro → examples/player/player.pro b/examples/simpleplayer/simpleplayer.pro → examples/player/player.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = player
 STATICLINK = 0
 PROJECTROOT = $$PWD/../..
 include($$PROJECTROOT/src/libQtAV.pri)

diff --git a/examples/simpleplayer/theme.qrc → examples/player/theme.qrc b/examples/simpleplayer/theme.qrc → examples/player/theme.qrc
diff --git a/...simpleplayer/theme/button-fastforward.png → examples/player/theme/button-fastforward.png b/...simpleplayer/theme/button-fastforward.png → examples/player/theme/button-fastforward.png
diff --git a/examples/simpleplayer/theme/button-next.png → examples/player/theme/button-next.png b/examples/simpleplayer/theme/button-next.png → examples/player/theme/button-next.png
diff --git a/.../simpleplayer/theme/button-play-pause.png → examples/player/theme/button-play-pause.png b/.../simpleplayer/theme/button-play-pause.png → examples/player/theme/button-play-pause.png
diff --git a/...es/simpleplayer/theme/button-previous.png → examples/player/theme/button-previous.png b/...es/simpleplayer/theme/button-previous.png → examples/player/theme/button-previous.png
diff --git a/...ples/simpleplayer/theme/button-rewind.png → examples/player/theme/button-rewind.png b/...ples/simpleplayer/theme/button-rewind.png → examples/player/theme/button-rewind.png
diff --git a/examples/simpleplayer/theme/button-stop.png → examples/player/theme/button-stop.png b/examples/simpleplayer/theme/button-stop.png → examples/player/theme/button-stop.png
diff --git a/examples/simpleplayer/theme/info.png → examples/player/theme/info.png b/examples/simpleplayer/theme/info.png → examples/player/theme/info.png
diff --git a/examples/simpleplayer/theme/open.png → examples/player/theme/open.png b/examples/simpleplayer/theme/open.png → examples/player/theme/open.png
diff --git a/examples/simpleplayer/theme/open_folder.png → examples/player/theme/open_folder.png b/examples/simpleplayer/theme/open_folder.png → examples/player/theme/open_folder.png
diff --git a/examples/simpleplayer/theme/screenshot.png → examples/player/theme/screenshot.png b/examples/simpleplayer/theme/screenshot.png → examples/player/theme/screenshot.png
diff --git a/examples/simpleplayer/theme/search-arrow.png → examples/player/theme/search-arrow.png b/examples/simpleplayer/theme/search-arrow.png → examples/player/theme/search-arrow.png
diff --git a/examples/simpleplayer/theme/search-icon.png → examples/player/theme/search-icon.png b/examples/simpleplayer/theme/search-icon.png → examples/player/theme/search-icon.png
diff --git a/examples/simpleplayer/theme/url.png → examples/player/theme/url.png b/examples/simpleplayer/theme/url.png → examples/player/theme/url.png
diff --git a/examples/player-d2d/main.cpp → examples/vo-d2d/main.cpp b/examples/player-d2d/main.cpp → examples/vo-d2d/main.cpp
diff --git a/examples/player-gl/player-gl.pro → examples/vo-d2d/vo-d2d.pro b/examples/player-gl/player-gl.pro → examples/vo-d2d/vo-d2d.pro
diff --git a/examples/player-gdi/main.cpp → examples/vo-gdi/main.cpp b/examples/player-gdi/main.cpp → examples/vo-gdi/main.cpp
diff --git a/examples/player-d2d/player-d2d.pro → examples/vo-gdi/vo-gdi.pro b/examples/player-d2d/player-d2d.pro → examples/vo-gdi/vo-gdi.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = player-d2d
 STATICLINK = 0
 PROJECTROOT = $$PWD/../..
 include($$PROJECTROOT/src/libQtAV.pri)

diff --git a/examples/player-gl/main.cpp → examples/vo-gl/main.cpp b/examples/player-gl/main.cpp → examples/vo-gl/main.cpp
diff --git a/examples/player-gdi/player-gdi.pro → examples/vo-gl/vo-gl.pro b/examples/player-gdi/player-gdi.pro → examples/vo-gl/vo-gl.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = player-gdi
 STATICLINK = 0
 PROJECTROOT = $$PWD/../..
 include($$PROJECTROOT/src/libQtAV.pri)